From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Wed, 8 May 2019 09:36:57 +0000 (+0200)
Subject: Move node-env file to a generic location
X-Git-Tag: nur_publish~50
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=commitdiff_plain;h=803d2d9f35005f10eb43e4568b7f0444d3f9d6aa

Move node-env file to a generic location
---

diff --git a/pkgs/crypto/iota-cli-app/node-env.nix b/lib/node-env.nix
similarity index 100%
rename from pkgs/crypto/iota-cli-app/node-env.nix
rename to lib/node-env.nix
diff --git a/libs.nix b/libs.nix
index 630b139..eb00311 100644
--- a/libs.nix
+++ b/libs.nix
@@ -12,6 +12,8 @@ rec {
   in
     (callPackage src {}) // { inherit src; };
 
+  nodeEnv = import ./lib/node-env.nix;
+
   fetchedGithub = path:
     let
       json = lib.importJSON path;
diff --git a/overlays/environments/immae-eu.nix b/overlays/environments/immae-eu.nix
index b535048..1f27e7c 100644
--- a/overlays/environments/immae-eu.nix
+++ b/overlays/environments/immae-eu.nix
@@ -66,6 +66,7 @@ let
     mylibs.yarn2nixPackage.yarn2nix
     nixops nix-prefetch-scripts nix-generate-from-cpan
     nix-zsh-completions bundix nodePackages.bower2nix
+    nodePackages.node2nix
     # (nixos {}).nixos-generate-config
     # (nixos {}).nixos-install
     # (nixos {}).nixos-enter
diff --git a/pkgs/crypto/iota-cli-app/default.nix b/pkgs/crypto/iota-cli-app/default.nix
index f0b5fed..1a9d3ed 100644
--- a/pkgs/crypto/iota-cli-app/default.nix
+++ b/pkgs/crypto/iota-cli-app/default.nix
@@ -1,6 +1,6 @@
 { stdenv, mylibs, fetchurl, fetchgit, callPackage, nodePackages, nodejs-8_x }:
 let
-  nodeEnv = callPackage ./node-env.nix { nodejs = nodejs-8_x; };
+  nodeEnv = callPackage mylibs.nodeEnv { nodejs = nodejs-8_x; };
   # built using node2nix -8 -l package-lock.json
   # and changing "./." to "src"
   packageEnv = import ./node-packages.nix {