diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:16:44 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-15 12:16:49 -0700 |
commit | 773b4deb7c5c6300f23f2ec2db4751e40f6520fa (patch) | |
tree | 45e1caaa95b76b129efe46e8c048be03c91f3baf /pkgs/development/compilers/ghc | |
parent | 316a09377d12b29764b5daf51e0df8986a5fe175 (diff) | |
parent | a6f6c0eeeb45ad122022366724e396955f0f775b (diff) | |
download | nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.gz nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.bz2 nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.lz nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.xz nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.tar.zst nixlib-773b4deb7c5c6300f23f2ec2db4751e40f6520fa.zip |
Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for all packages.
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r-- | pkgs/development/compilers/ghc/6.10.2-binary.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.0.4-binary.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.4.2-binary.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 4e660853f200..96ec4e6c114a 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. (if stdenv.isLinux then '' - find . -type f -perm +100 \ + find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libedit}/lib:${ncurses}/lib:${gmp}/lib" {} \; for prog in ld ar gcc strip ranlib; do diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 7a6f1b78fa49..31df7f1fa355 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. stdenv.lib.optionalString stdenv.isLinux '' - find . -type f -perm +100 \ + find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${ncurses}/lib:${gmp}/lib" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 3d781e9d558f..03dd4dcd35bb 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionalString stdenv.isLinux '' mkdir -p "$out/lib" ln -sv "${ncurses}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" - find . -type f -perm +100 \ + find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${gmp}/lib" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 |