treewide: Make explicit that 'dev' output of mpfr is used
This commit is contained in:
parent
3672f3edcb
commit
3f8b08f506
|
@ -235,7 +235,7 @@ stdenv.mkDerivation ({
|
||||||
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
|
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
|
||||||
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
|
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
|
||||||
--with-gmp=${gmp.dev}
|
--with-gmp=${gmp.dev}
|
||||||
--with-mpfr=${mpfr}
|
--with-mpfr=${mpfr.dev}
|
||||||
--with-mpc=${libmpc}
|
--with-mpc=${libmpc}
|
||||||
${if libelf != null then "--with-libelf=${libelf}" else ""}
|
${if libelf != null then "--with-libelf=${libelf}" else ""}
|
||||||
--disable-libstdcxx-pch
|
--disable-libstdcxx-pch
|
||||||
|
|
|
@ -296,7 +296,7 @@ stdenv.mkDerivation ({
|
||||||
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
|
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
|
||||||
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
|
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
|
||||||
--with-gmp=${gmp.dev}
|
--with-gmp=${gmp.dev}
|
||||||
--with-mpfr=${mpfr}
|
--with-mpfr=${mpfr.dev}
|
||||||
--with-mpc=${libmpc}
|
--with-mpc=${libmpc}
|
||||||
${if libelf != null then "--with-libelf=${libelf}" else ""}
|
${if libelf != null then "--with-libelf=${libelf}" else ""}
|
||||||
--disable-libstdcxx-pch
|
--disable-libstdcxx-pch
|
||||||
|
|
|
@ -339,7 +339,7 @@ stdenv.mkDerivation ({
|
||||||
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
|
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
|
||||||
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
|
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
|
||||||
--with-gmp=${gmp.dev}
|
--with-gmp=${gmp.dev}
|
||||||
--with-mpfr=${mpfr}
|
--with-mpfr=${mpfr.dev}
|
||||||
--with-mpc=${libmpc}
|
--with-mpc=${libmpc}
|
||||||
${if libelf != null then "--with-libelf=${libelf}" else ""}
|
${if libelf != null then "--with-libelf=${libelf}" else ""}
|
||||||
--disable-libstdcxx-pch
|
--disable-libstdcxx-pch
|
||||||
|
|
|
@ -346,7 +346,7 @@ stdenv.mkDerivation ({
|
||||||
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
|
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
|
||||||
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
|
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
|
||||||
--with-gmp=${gmp.dev}
|
--with-gmp=${gmp.dev}
|
||||||
--with-mpfr=${mpfr}
|
--with-mpfr=${mpfr.dev}
|
||||||
--with-mpc=${libmpc}
|
--with-mpc=${libmpc}
|
||||||
${if libelf != null then "--with-libelf=${libelf}" else ""}
|
${if libelf != null then "--with-libelf=${libelf}" else ""}
|
||||||
--disable-libstdcxx-pch
|
--disable-libstdcxx-pch
|
||||||
|
|
|
@ -340,7 +340,7 @@ stdenv.mkDerivation ({
|
||||||
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
|
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
|
||||||
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
|
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
|
||||||
--with-gmp=${gmp.dev}
|
--with-gmp=${gmp.dev}
|
||||||
--with-mpfr=${mpfr}
|
--with-mpfr=${mpfr.dev}
|
||||||
--with-mpc=${libmpc}
|
--with-mpc=${libmpc}
|
||||||
${if libelf != null then "--with-libelf=${libelf}" else ""}
|
${if libelf != null then "--with-libelf=${libelf}" else ""}
|
||||||
--disable-libstdcxx-pch
|
--disable-libstdcxx-pch
|
||||||
|
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||||
--with-gmp=${gmp.dev}
|
--with-gmp=${gmp.dev}
|
||||||
--with-isl=${isl_0_14}
|
--with-isl=${isl_0_14}
|
||||||
--with-mpc=${libmpc}
|
--with-mpc=${libmpc}
|
||||||
--with-mpfr=${mpfr}
|
--with-mpfr=${mpfr.dev}
|
||||||
--with-native-system-header-dir=${Libsystem}/include
|
--with-native-system-header-dir=${Libsystem}/include
|
||||||
--with-system-zlib
|
--with-system-zlib
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -1860,7 +1860,7 @@ let
|
||||||
|
|
||||||
Rmpfr = old.Rmpfr.overrideDerivation (attrs: {
|
Rmpfr = old.Rmpfr.overrideDerivation (attrs: {
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-mpfr-include=${pkgs.mpfr}/include"
|
"--with-mpfr-include=${pkgs.mpfr.dev}/include"
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
configureFlags = with stdenv.lib;
|
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-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}"
|
||||||
"--with-separate-debug-dir=/run/current-system/sw/lib/debug"
|
"--with-separate-debug-dir=/run/current-system/sw/lib/debug"
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in a new issue