diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:37:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:58:40 +0200 |
| commit | e4832c754114c5660909546ac749475bf63ff06e (patch) | |
| tree | fe77400566603caa218453ad5c7b6b9b5ea9715c /pkgs/development/compilers/ghc/7.0.4-binary.nix | |
| parent | 60a890e35bc94ace092a2ec278534979fe6ee361 (diff) | |
| parent | dc13593b9fad3ea3728e2fd32f90841d5ec7662d (diff) | |
| download | nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.gz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.bz2 nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.lz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.xz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.zst nixlib-e4832c754114c5660909546ac749475bf63ff06e.zip | |
Merge branch 'staging'
Includes a security update of libxml2.
Diffstat (limited to 'pkgs/development/compilers/ghc/7.0.4-binary.nix')
| -rw-r--r-- | pkgs/development/compilers/ghc/7.0.4-binary.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 77e5229a2a0a..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}/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}"} ''; |