From 10cadef0276b92a88cc7293cc2911ae59378fe84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 17 May 2024 19:49:27 +0200 Subject: [PATCH] hedgedoc: fix executing scripts, delete unused setup script --- pkgs/servers/web-apps/hedgedoc/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index 1992c14270e7..7e1c7644fb01 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -55,6 +55,10 @@ in stdenv.mkDerivation { python3 # needed for sqlite node-gyp ]; + buildInputs = [ + nodejs + ]; + dontConfigure = true; buildPhase = '' @@ -75,7 +79,8 @@ in stdenv.mkDerivation { yarn --immutable-cache yarn run build - rm bin/heroku + # Delete scripts that are not useful for NixOS + rm bin/{heroku,setup} patchShebangs bin/* runHook postBuild @@ -85,11 +90,10 @@ in stdenv.mkDerivation { runHook preInstall mkdir -p $out/share/hedgedoc - cp -r bin $out - cp -r {app.js,lib,locales,node_modules,package.json,public} $out/share/hedgedoc + cp -r {app.js,bin,lib,locales,node_modules,package.json,public} $out/share/hedgedoc - for bin in $out/bin/*; do - wrapProgram $bin \ + for bin in $out/share/hedgedoc/bin/*; do + makeWrapper $bin $out/bin/$(basename $bin) \ --set NODE_ENV production \ --set NODE_PATH "$out/share/hedgedoc/lib/node_modules" done