nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

node-env: fix for utillinux deprecation

Browse Source
This commit is contained in:
Tyler Hardin 2024-10-23 20:41:50 -04:00
parent 1299718cc9
commit f9fb59ff21
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/node-packages/node-env.nix
View File

@ -3,9 +3,6 @@
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: {lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
let let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
python = if nodejs ? python then nodejs.python else python2; python = if nodejs ? python then nodejs.python else python2;
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@ -499,7 +496,7 @@ let
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "${name}${if version == null then "" else "-${version}"}"; name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ] buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
++ buildInputs; ++ buildInputs;
@ -591,7 +588,7 @@ let
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ] buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
++ buildInputs; ++ buildInputs;
@ -662,7 +659,7 @@ let
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}"; name = "node-shell-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ buildInputs; buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux ++ buildInputs;
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
cat > $out/bin/shell <<EOF cat > $out/bin/shell <<EOF