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/compilers/ghc/7.10.2.nix
View File

@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';

2
pkgs/development/compilers/ghc/7.10.3.nix
View File

@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';

2
pkgs/development/compilers/ghc/8.0.1.nix
View File

@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';

2
pkgs/development/compilers/ghc/head.nix
View File

@@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
done
'';

2
pkgs/development/compilers/microscheme/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
make install PREFIX=$out
wrapProgram $out/bin/microscheme \
--prefix PATH : "${avrdude}/bin:${avrgcclibc}/bin"
--prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcclibc ]}"
'';
meta = with stdenv.lib; {

2
pkgs/development/compilers/squeak/default.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
postPatch = ''
for i in squeak.in squeak.sh.in; do
substituteInPlace unix/cmake/$i --replace "PATH=" \
"PATH=${coreutils}/bin:${gnused}/bin:${which}/bin #"
"PATH=${stdenv.lib.makeBinPath [ coreutils gnused which ]} #"
done
'';