From 3f8b08f5064743ccab3b231757be61c6473a1cd1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 20:40:40 +0300 Subject: [PATCH] treewide: Make explicit that 'dev' output of mpfr is used --- pkgs/development/compilers/gcc/4.5/default.nix | 2 +- pkgs/development/compilers/gcc/4.6/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/gfortran-darwin.nix | 2 +- pkgs/development/r-modules/default.nix | 2 +- pkgs/development/tools/misc/gdb/default.nix | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index ed72a3e27e9..339f170c783 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -235,7 +235,7 @@ stdenv.mkDerivation ({ ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} --with-gmp=${gmp.dev} - --with-mpfr=${mpfr} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 2ce432d452f..f84d8fe3358 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -296,7 +296,7 @@ stdenv.mkDerivation ({ ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} --with-gmp=${gmp.dev} - --with-mpfr=${mpfr} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 4895c3a22ce..d77087acf15 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -339,7 +339,7 @@ stdenv.mkDerivation ({ ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} --with-gmp=${gmp.dev} - --with-mpfr=${mpfr} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index dcd6feb8f89..0ebe7ce1987 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -346,7 +346,7 @@ stdenv.mkDerivation ({ ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} --with-gmp=${gmp.dev} - --with-mpfr=${mpfr} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index e3b8cfc8efe..7db517bd554 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -340,7 +340,7 @@ stdenv.mkDerivation ({ ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} --with-gmp=${gmp.dev} - --with-mpfr=${mpfr} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix index 1de3cc0ed11..7fa58a053b4 100644 --- a/pkgs/development/compilers/gcc/gfortran-darwin.nix +++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --with-gmp=${gmp.dev} --with-isl=${isl_0_14} --with-mpc=${libmpc} - --with-mpfr=${mpfr} + --with-mpfr=${mpfr.dev} --with-native-system-header-dir=${Libsystem}/include --with-system-zlib ''; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 99cb9d03ab6..81684916007 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1860,7 +1860,7 @@ let Rmpfr = old.Rmpfr.overrideDerivation (attrs: { configureFlags = [ - "--with-mpfr-include=${pkgs.mpfr}/include" + "--with-mpfr-include=${pkgs.mpfr.dev}/include" ]; }); diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 0e27cc7104e..6635044ce67 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = with stdenv.lib; - [ "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr}" "--with-system-readline" + [ "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline" "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}" "--with-separate-debug-dir=/run/current-system/sw/lib/debug" ]