diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 712f62e8d4fd2..47cdb6942cecc 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix index 633219626b68f..782440592f26a 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs }: -(import ./composition.nix { +(import ./node-composition.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; })."package".override { diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/generate.sh b/pkgs/applications/networking/instant-messengers/matrix-recorder/generate.sh new file mode 100755 index 0000000000000..7111289d29098 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/generate.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +node2nix \ + --node-env node-env.nix \ + --development \ + --input package.json \ + --output node-packages.nix \ + --composition node-composition.nix diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-composition.nix similarity index 61% rename from pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix rename to pkgs/applications/networking/instant-messengers/matrix-recorder/node-composition.nix index 92ddfe3429820..c970861a86f0d 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.7.0. Do not edit! +# This file has been generated by node2nix 1.8.0. Do not edit! {pkgs ? import { inherit system; @@ -6,16 +6,12 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; -locpkgs = +in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; - globalBuildInputs = [ - locpkgs.node-pre-gyp - ]; -}; -in locpkgs +} \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix index ff5ca0d99b19d..e1abf53049350 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -57,7 +57,7 @@ let # Recursively composes the dependencies of a package composePackage = { name, packageName, src, dependencies ? [], ... }@args: - '' + builtins.addErrorContext "while evaluating node package '${packageName}'" '' DIR=$(pwd) cd $TMPDIR @@ -363,7 +363,7 @@ let npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild - if [ "$dontNpmInstall" != "1" ] + if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json @@ -396,10 +396,12 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux + ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool ++ buildInputs; + inherit nodejs; + inherit dontStrip; # Stripping may fail a build for some package deployments inherit dontNpmInstall preRebuild unpackPhase buildPhase; @@ -468,7 +470,7 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux + ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool ++ buildInputs; @@ -514,7 +516,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell < $out/bin/shell < $out/bin/shell < $out/bin/shell <