diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:29:17 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:35 +0200 |
| commit | df8495fb18305bfd926a4e7b4dbf5c27edb70400 (patch) | |
| tree | e98d5dd9698bd2a6998ecd6e8ba080112ff50ba6 | |
| parent | a1909d73800a520b34640693343da7b68d5b7294 (diff) | |
| download | nixlib-df8495fb18305bfd926a4e7b4dbf5c27edb70400.tar nixlib-df8495fb18305bfd926a4e7b4dbf5c27edb70400.tar.gz nixlib-df8495fb18305bfd926a4e7b4dbf5c27edb70400.tar.bz2 nixlib-df8495fb18305bfd926a4e7b4dbf5c27edb70400.tar.lz nixlib-df8495fb18305bfd926a4e7b4dbf5c27edb70400.tar.xz nixlib-df8495fb18305bfd926a4e7b4dbf5c27edb70400.tar.zst nixlib-df8495fb18305bfd926a4e7b4dbf5c27edb70400.zip | |
treewide: Mass replace 'gmp}/lib' to refer the 'out' output
| -rw-r--r-- | pkgs/development/compilers/ghc/7.4.2-binary.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.0.1.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index a57aff4d864f..70cd7d21c477 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # We have to patch the GMP paths for the integer-gmp package. '' find . -name integer-gmp.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \; + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ln -sv "${ncurses.lib}/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}/lib" {} \; + --set-rpath "$out/lib:${gmp.out}/lib" {} \; 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 @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure --prefix=$out \ - --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ + --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \ ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} ''; diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 7f337c019531..b262a448d4da 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" + "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" |