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

treewide: Make explicit that 'dev' output of mpfr is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:40:40 +03:00 committed by Vladimír Čunát
parent 3672f3edcb
commit 3f8b08f506
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/4.5/default.nix
View File

@ -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

2
pkgs/development/compilers/gcc/4.6/default.nix
View File

@ -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

2
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -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

2
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -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

2
pkgs/development/compilers/gcc/5/default.nix
View File

@ -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

2
pkgs/development/compilers/gcc/gfortran-darwin.nix
View File

@ -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
'';

2
pkgs/development/r-modules/default.nix
View File

@ -1860,7 +1860,7 @@ let
Rmpfr = old.Rmpfr.overrideDerivation (attrs: {
configureFlags = [
"--with-mpfr-include=${pkgs.mpfr}/include"
"--with-mpfr-include=${pkgs.mpfr.dev}/include"
];
});

2
pkgs/development/tools/misc/gdb/default.nix
View File

@ -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"
]