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

treewide: Use makeBinPath

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2016-08-23 01:06:51 +03:00
parent c255395219
commit 74a3a2cd7e
65 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/elixir/default.nix
View File

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
b=$(basename $f)
if [ $b == "mix" ]; then continue; fi
wrapProgram $f \
--prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl.bin}/bin:${bash}/bin" \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \
--set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
done

2
pkgs/development/interpreters/erlang/R16.nix
View File

@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;

2
pkgs/development/interpreters/erlang/R17.nix
View File

@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;

2
pkgs/development/interpreters/erlang/R18.nix
View File

@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;

2
pkgs/development/interpreters/erlang/R19.nix
View File

@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;

2
pkgs/development/interpreters/lfe/default.nix
View File

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
# Add some stuff to PATH so the scripts can run without problems.
for f in $out/bin/*; do
wrapProgram $f \
--prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${bash}/bin:$out/bin"
--prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils bash ]}:$out/bin"
substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env"
done
'';