diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 19:58:41 +0300 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:36 +0200 |
commit | 47c45e20415643ecca52f8a0c0a4350b5ef84370 (patch) | |
tree | cdf238414d3759a4d9962675d083551a395456ec /pkgs/development/compilers | |
parent | f81af4e6f0ad46df11a0fb99d5664e7c400bf2bf (diff) |
treewide: Make explicit that 'dev' output of gmp is used
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/aliceml/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ecl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.5/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/gfortran-darwin.nix | 2 | ||||
-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 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.0.1.nix | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 6fbc1a350f5c..2a59765b0f3b 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { ''; buildPhase = '' - gmp="${gmp}" zlib="${zlib}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out" + gmp="${gmp.dev}" zlib="${zlib}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out" ''; meta = { diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index ee7dffdf0652..eb4544879f6e 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { }; configureFlags = [ "--enable-threads" - "--with-gmp-prefix=${gmp}" + "--with-gmp-prefix=${gmp.dev}" "--with-libffi-prefix=${libffi}" ] ++ diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 6cde7aba92a0..ed72a3e27e94 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -234,7 +234,7 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-mpfr=${mpfr} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index bc968d1f66e3..2ce432d452fb 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -295,7 +295,7 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-mpfr=${mpfr} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 5089f703d5ed..4895c3a22cef 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -338,7 +338,7 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-mpfr=${mpfr} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 212413648236..dcd6feb8f893 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -345,7 +345,7 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-mpfr=${mpfr} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index d7ff8fe99dfc..e3b8cfc8efe9 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -339,7 +339,7 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-mpfr=${mpfr} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix index 66f273482cfb..1de3cc0ed11e 100644 --- a/pkgs/development/compilers/gcc/gfortran-darwin.nix +++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --enable-checking=release --enable-languages=fortran --with-cloog=${cloog} - --with-gmp=${gmp} + --with-gmp=${gmp.dev} --with-isl=${isl_0_14} --with-mpc=${libmpc} --with-mpfr=${mpfr} diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 77e5229a2a0a..37eb3440ca42 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}/lib --with-gmp-includes=${gmp.dev}/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 c9f281980d95..d851568d6598 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}/include \ + --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/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 bb8a98d61b1f..1565ce2b3dbd 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib" + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" |