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/8.0.1.nix | |
| parent | 60a890e35bc94ace092a2ec278534979fe6ee361 (diff) | |
| parent | dc13593b9fad3ea3728e2fd32f90841d5ec7662d (diff) | |
| download | nixpkgs-e4832c754114c5660909546ac749475bf63ff06e.tar nixpkgs-e4832c754114c5660909546ac749475bf63ff06e.tar.gz nixpkgs-e4832c754114c5660909546ac749475bf63ff06e.tar.bz2 nixpkgs-e4832c754114c5660909546ac749475bf63ff06e.tar.lz nixpkgs-e4832c754114c5660909546ac749475bf63ff06e.tar.xz nixpkgs-e4832c754114c5660909546ac749475bf63ff06e.tar.zst nixpkgs-e4832c754114c5660909546ac749475bf63ff06e.zip | |
Merge branch 'staging'
Includes a security update of libxml2.
Diffstat (limited to 'pkgs/development/compilers/ghc/8.0.1.nix')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.0.1.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index f129e850367..612c237735c 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib" - "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.out}/lib" + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; |