From 6e59bc79696bc826fdbf6821c0e0eccad93703db Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 9 Aug 2021 17:09:46 +0200 Subject: [PATCH] cryptpad: use nodejs12 --- pkgs/servers/web-apps/cryptpad/generate.sh | 2 ++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh index f1e8e5e708fe..925420c49a58 100755 --- a/pkgs/servers/web-apps/cryptpad/generate.sh +++ b/pkgs/servers/web-apps/cryptpad/generate.sh @@ -1,6 +1,8 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nix +# This script is meant to be run in the current directory + cryptpadSrc=$(nix eval '(import ../../../.. {}).cryptpad.src' --raw) echo "cryptpad src: $cryptpadSrc" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1431bce8baf..4ac1624d7977 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3781,7 +3781,9 @@ with pkgs; cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; - cryptpad = callPackage ../servers/web-apps/cryptpad { }; + cryptpad = callPackage ../servers/web-apps/cryptpad { + nodejs = nodejs-12_x; + }; ethash = callPackage ../development/libraries/ethash { };