Add flake skeletons

[perso/Immae/Config/Nix.git] / flakes / etherpad-lite / default.nix

diff --git a/flakes/etherpad-lite/default.nix b/flakes/etherpad-lite/default.nix
index 5274351c79dda736ab5b82ea3b09c970981a2b33..1dd5aa4302293ce768e9bc7fd1de9f8f5f5f829b 100644 (file)
--- a/flakes/etherpad-lite/default.nix
+++ b/flakes/etherpad-lite/default.nix
@@ -1,7 +1,6 @@
 { varDir ? "/var/lib/etherpad-lite" # if you override this change the StateDirectory in service file too!
-, stdenv, callPackage, src, lib, nodejs }:
+, nodeEnv, stdenv, callPackage, src, lib, nodejs }:
 let
-  nodeEnv = callPackage ../../lib/node-env.nix {};
   moduleNames = [
     "ep_aa_file_menu_toolbar" "ep_adminpads" "ep_align" "ep_bookmark"
     "ep_clear_formatting" "ep_colors" "ep_comments_page"
@@ -14,7 +13,7 @@ let
   ];
   # nix files are built using node2nix -i node-packages.json
   allModules = lib.attrsets.genAttrs moduleNames
-    (name: (callPackage (./modules + "/${name}/node-packages.nix") { inherit nodeEnv; }).${name});
+    (name: (callPackage (./modules + "/${name}/node-packages.nix") { nodeEnv = callPackage nodeEnv {}; }).${name});
   toPassthru = pkg: moduleNames: {
     inherit varDir allModules nodejs moduleNames;
     withModules = withModules pkg;
@@ -38,7 +37,7 @@ let
   # built using node2nix -l package-lock.json
   # and changing "./." to "src"
   node-environment = (callPackage ./node-packages.nix {
-    inherit nodeEnv;
+    nodeEnv = callPackage nodeEnv {};
     src = stdenv.mkDerivation {
       pname = "etherpad-lite";
       version = src.version;