diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-28 18:20:16 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:04:42 +0200 |
| commit | 99e68e7c83e6601abf1861f9a6426eb79f7cf554 (patch) | |
| tree | c91c944e34b2613f802b51c11705a19d4dc26f6e | |
| parent | e254750560ed703de844b6d7390e56914b59dbed (diff) | |
| download | nixlib-99e68e7c83e6601abf1861f9a6426eb79f7cf554.tar nixlib-99e68e7c83e6601abf1861f9a6426eb79f7cf554.tar.gz nixlib-99e68e7c83e6601abf1861f9a6426eb79f7cf554.tar.bz2 nixlib-99e68e7c83e6601abf1861f9a6426eb79f7cf554.tar.lz nixlib-99e68e7c83e6601abf1861f9a6426eb79f7cf554.tar.xz nixlib-99e68e7c83e6601abf1861f9a6426eb79f7cf554.tar.zst nixlib-99e68e7c83e6601abf1861f9a6426eb79f7cf554.zip | |
ghc-*: fix evaluation when using single-output gmp
| -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 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 37eb3440ca42..f0f54252b3fc 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure --prefix=$out \ - --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/include \ + --with-gmp-libraries=${gmp.out or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/include \ ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} ''; diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index d851568d6598..07137578585d 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure --prefix=$out \ - --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/include \ + --with-gmp-libraries=${gmp.out or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/include \ ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} ''; |