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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
obadz
2016-08-23 18:50:06 +01:00
parent 13c04c837d 415e1983ca
commit 0e8d2725dc
244 changed files with 767 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/factor-lang/default.nix
View File

@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
sed -ie 's#/usr/share/zoneinfo/#${tzdata}/share/zoneinfo/#g' \
$out/lib/factor/extra/tzinfo/tzinfo.factor
sed -ie 's#/usr/share/terminfo#${ncurses}/share/terminfo#g' \
sed -ie 's#/usr/share/terminfo#${ncurses.out}/share/terminfo#g' \
$out/lib/factor/extra/terminfo/terminfo.factor
cp ./factor $out/bin

2
pkgs/development/compilers/gcc-arm-embedded/default.nix
View File

@@ -34,7 +34,7 @@ stdenv.mkDerivation {
for f in $(find $out); do
if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \
--set-rpath $out/lib:${getLib gcc}/lib:${ncurses.out}/lib \
--set-rpath ${stdenv.lib.makeLibraryPath [ "$out" gcc ncurses ]} \
"$f" || true
fi
done

4
pkgs/development/compilers/gcc/6/default.nix
View File

@@ -335,8 +335,8 @@ stdenv.mkDerivation ({
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp}
--with-mpfr=${mpfr}
--with-gmp=${gmp.dev}
--with-mpfr=${mpfr.dev}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}
--disable-libstdcxx-pch

2
pkgs/development/compilers/ghc/6.10.2-binary.nix
View File

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
(if stdenv.isLinux then ''
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libedit}/lib:${ncurses5.out}/lib:${gmp.out}/lib" {} \;
--set-rpath "${lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \;
for prog in ld ar gcc strip ranlib; do
find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
done

2
pkgs/development/compilers/ghc/7.0.4-binary.nix
View File

@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optionalString stdenv.isLinux ''
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${ncurses5.out}/lib:${gmp.out}/lib" {} \;
--set-rpath "${stdenv.lib.makeLibraryPath [ ncurses5 gmp ]}" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
for prog in ld ar gcc strip ranlib; do

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/7.4.2-binary.nix
View File

@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
find . -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/lib:${gmp.out}/lib" {} \;
--set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \;
sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
for prog in ld ar gcc strip ranlib; do

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/julia/default.nix
View File

@@ -151,7 +151,7 @@ stdenv.mkDerivation rec {
for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
wrapProgram "$prog" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
--prefix PATH : "${curl}/bin"
--prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
done
'';

4
pkgs/development/compilers/julia/git.nix
View File

@@ -163,8 +163,8 @@ stdenv.mkDerivation rec {
postInstall = ''
for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
wrapProgram "$prog" \
--prefix LD_LIBRARY_PATH : "$out/lib/julia:$LD_LIBRARY_PATH" \
--prefix PATH : "${curl}/bin"
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
--prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
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/opa/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# Paths so the opa compiler code generation will use the same programs as were
# used to build opa.
codeGeneratorPaths = "${ocamlPackages.ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin:${nodejs}/bin";
codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
preConfigure = ''
patchShebangs .

2
pkgs/development/compilers/opendylan/bin.nix
View File

@@ -29,7 +29,7 @@ stdenv.mkDerivation {
for a in "$out"/lib/*.so; do
patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
done
sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam
sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam
wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin
'';

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

@@ -32,7 +32,7 @@ stdenv.mkDerivation {
checkTarget = "test";
preCheck = ''
export LIBRARY_PATH="$out/lib:${openssl.out}/lib:${pcre2}/lib"
export LIBRARY_PATH="$out/lib:${stdenv.lib.makeLibraryPath [ openssl pcre2 ]}"
'';
installPhase = ''

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
'';