public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #110917 from siraben/loadlibrary-stdenv-lib

Browse Source
This commit is contained in:
Sandro 2021-01-27 10:56:59 +01:00 committed by GitHub
commit 6a146b1370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/node-packages/default.nix
View File

@ -17,7 +17,7 @@ let
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
postInstall = '' postInstall = ''
for prog in bower2nix fetch-bower; do for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} wrapProgram "$out/bin/$prog" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.git pkgs.nix ]}
done done
''; '';
}; };
@ -91,7 +91,7 @@ let
makam = super.makam.override { makam = super.makam.override {
buildInputs = [ pkgs.nodejs pkgs.makeWrapper ]; buildInputs = [ pkgs.nodejs pkgs.makeWrapper ];
postFixup = '' postFixup = ''
wrapProgram "$out/bin/makam" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nodejs ]} wrapProgram "$out/bin/makam" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nodejs ]}
${ ${
if stdenv.isLinux if stdenv.isLinux
then "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\"" then "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""
@ -138,7 +138,7 @@ let
node2nix = super.node2nix.override { node2nix = super.node2nix.override {
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} wrapProgram "$out/bin/node2nix" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]}
''; '';
}; };
@ -168,7 +168,7 @@ let
''; '';
postInstall = let postInstall = let
pnpmLibPath = stdenv.lib.makeBinPath [ pnpmLibPath = pkgs.lib.makeBinPath [
nodejs.passthru.python nodejs.passthru.python
nodejs nodejs
]; ];
@ -185,7 +185,7 @@ let
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/pulp" --suffix PATH : ${stdenv.lib.makeBinPath [ wrapProgram "$out/bin/pulp" --suffix PATH : ${pkgs.lib.makeBinPath [
pkgs.purescript pkgs.purescript
]} ]}
''; '';
@ -220,7 +220,7 @@ let
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/typescript-language-server" \ wrapProgram "$out/bin/typescript-language-server" \
--prefix PATH : ${stdenv.lib.makeBinPath [ self.typescript ]} --prefix PATH : ${pkgs.lib.makeBinPath [ self.typescript ]}
''; '';
}; };

2
pkgs/tools/misc/loadlibrary/default.nix
View File

@ -5,7 +5,7 @@
stdenv_32bit.mkDerivation rec { stdenv_32bit.mkDerivation rec {
name = "loadlibrary-${version}"; name = "loadlibrary-${version}";
version = "20170525-${stdenv_32bit.lib.strings.substring 0 7 rev}"; version = "20170525-${lib.strings.substring 0 7 rev}";
rev = "721b084c088d779075405b7f20c77c2578e2a961"; rev = "721b084c088d779075405b7f20c77c2578e2a961";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;