Skip to content

Commit 67a51a7

Browse files
committed
node-packages: use util-linux instead of utillinux in node-env.nix
The `util-linux` alias to `utillinux` has been replaced by a `throw` in commit a9e1f4e. The check must be reversed. Also, tidy things up by using the `util-linux` variable name instead of the older `utillinux`.
1 parent 2a5f82b commit 67a51a7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pkgs/development/node-packages/node-env.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
let
66
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
7-
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
7+
util-linux = if pkgs ? util-linux then pkgs.util-linux else pkgs.utillinux;
88

99
python = if nodejs ? python then nodejs.python else python2;
1010

@@ -499,7 +499,7 @@ let
499499
stdenv.mkDerivation ({
500500
name = "${name}${if version == null then "" else "-${version}"}";
501501
buildInputs = [ tarWrapper python nodejs ]
502-
++ lib.optional (stdenv.hostPlatform.isLinux) utillinux
502+
++ lib.optional (stdenv.hostPlatform.isLinux) util-linux
503503
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
504504
++ buildInputs;
505505

@@ -591,7 +591,7 @@ let
591591
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
592592

593593
buildInputs = [ tarWrapper python nodejs ]
594-
++ lib.optional (stdenv.hostPlatform.isLinux) utillinux
594+
++ lib.optional (stdenv.hostPlatform.isLinux) util-linux
595595
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
596596
++ buildInputs;
597597

@@ -662,7 +662,7 @@ let
662662
stdenv.mkDerivation ({
663663
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
664664

665-
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ buildInputs;
665+
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) util-linux ++ buildInputs;
666666
buildCommand = ''
667667
mkdir -p $out/bin
668668
cat > $out/bin/shell <<EOF

0 commit comments

Comments
 (0)