public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge: make dev output references explicit

Browse Source 
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
This commit is contained in:
Vladimír Čunát
2016-05-22 12:09:23 +02:00
parent bfd522da63 c02f0ade90
commit c4661e9643
199 changed files with 308 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/7.0.4-binary.nix
+1 -1
View File
@@ -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}"}
'';
pkgs/development/compilers/ghc/7.4.2-binary.nix
+1 -1
View File
@@ -91,7 +91,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}"}
'';
pkgs/development/compilers/ghc/8.0.1.nix
+2 -2
View File
@@ -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"
];