diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:37:04 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:58:40 +0200 |
commit | e4832c754114c5660909546ac749475bf63ff06e (patch) | |
tree | fe77400566603caa218453ad5c7b6b9b5ea9715c /pkgs/development/compilers | |
parent | 60a890e35bc94ace092a2ec278534979fe6ee361 (diff) | |
parent | dc13593b9fad3ea3728e2fd32f90841d5ec7662d (diff) |
Merge branch 'staging'
Includes a security update of libxml2.
Diffstat (limited to 'pkgs/development/compilers')
21 files changed, 43 insertions, 46 deletions
diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 6fbc1a350f5c..01a8a337fc0a 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.dev}" 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..d4bfc93df93e 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation { }; configureFlags = [ "--enable-threads" - "--with-gmp-prefix=${gmp}" - "--with-libffi-prefix=${libffi}" + "--with-gmp-prefix=${gmp.dev}" + "--with-libffi-prefix=${libffi.dev}" ] ++ (stdenv.lib.optional (! noUnicode) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 6cde7aba92a0..b1eedf7707df 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (libpthread != null) libpthread; extraCPPSpec = concatStrings (intersperse " " - (map (x: "-I${x}/include") extraCPPDeps)); + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); extraLibSpec = if libpthreadCross != null then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" @@ -234,8 +234,8 @@ 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-mpfr=${mpfr} + --with-gmp=${gmp.dev} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -323,7 +323,7 @@ stdenv.mkDerivation ({ # Likewise, the LTO code doesn't find zlib. CPATH = concatStrings - (intersperse ":" (map (x: x + "/include") + (intersperse ":" (map (x: "${x.dev or x}/include") (optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc ] ++ optionals javaAwtGtk xlibs diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index bc968d1f66e3..7003f4335c8a 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -215,7 +215,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (libpthread != null) libpthread; extraCPPSpec = concatStrings (intersperse " " - (map (x: "-I${x}/include") extraCPPDeps)); + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); extraLibSpec = if libpthreadCross != null then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" @@ -295,8 +295,8 @@ 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-mpfr=${mpfr} + --with-gmp=${gmp.dev} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -398,7 +398,7 @@ stdenv.mkDerivation ({ # Likewise, the LTO code doesn't find zlib. CPATH = concatStrings - (intersperse ":" (map (x: x + "/include") + (intersperse ":" (map (x: "${x.dev or x}/include") (optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc ] ++ optionals javaAwtGtk xlibs diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 5089f703d5ed..6810b52574c6 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -241,7 +241,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (libpthread != null) libpthread; extraCPPSpec = concatStrings (intersperse " " - (map (x: "-I${x}/include") extraCPPDeps)); + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); extraLibSpec = if libpthreadCross != null then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" @@ -338,8 +338,8 @@ 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-mpfr=${mpfr} + --with-gmp=${gmp.dev} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -460,7 +460,7 @@ stdenv.mkDerivation ({ # Likewise, the LTO code doesn't find zlib. CPATH = concatStrings - (intersperse ":" (map (x: x + "/include") + (intersperse ":" (map (x: "${x.dev or x}/include") (optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc ] ++ optionals javaAwtGtk xlibs diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 212413648236..195a7b03eed4 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -244,7 +244,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (libpthread != null) libpthread; extraCPPSpec = concatStrings (intersperse " " - (map (x: "-I${x}/include") extraCPPDeps)); + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); extraLibSpec = if libpthreadCross != null then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" @@ -345,8 +345,8 @@ 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-mpfr=${mpfr} + --with-gmp=${gmp.dev} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -467,7 +467,7 @@ stdenv.mkDerivation ({ # Likewise, the LTO code doesn't find zlib. CPATH = concatStrings - (intersperse ":" (map (x: x + "/include") + (intersperse ":" (map (x: "${x.dev or x}/include") (optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc ] ++ optionals javaAwtGtk xlibs diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index d7ff8fe99dfc..9e0220ffc728 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -242,7 +242,7 @@ stdenv.mkDerivation ({ ++ stdenv.lib.optional (libpthread != null) libpthread; extraCPPSpec = concatStrings (intersperse " " - (map (x: "-I${x}/include") extraCPPDeps)); + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); extraLibSpec = if libpthreadCross != null then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" @@ -339,8 +339,8 @@ 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-mpfr=${mpfr} + --with-gmp=${gmp.dev} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -460,7 +460,7 @@ stdenv.mkDerivation ({ # Likewise, the LTO code doesn't find zlib. CPATH = concatStrings - (intersperse ":" (map (x: x + "/include") + (intersperse ":" (map (x: "${x.dev or x}/include") (optionals (zlib != null) [ zlib ] ++ optionals langJava [ boehmgc ] ++ optionals javaAwtGtk xlibs diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 5b206a63daa1..22107e72ef70 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -201,23 +201,20 @@ postConfigure() { preInstall() { - # Make ‘lib64’ a symlink to ‘lib’. + # Make ‘lib64’ symlinks to ‘lib’. if [ -n "$is64bit" -a -z "$enableMultilib" ]; then - mkdir -p $out/lib - ln -s lib $out/lib64 + mkdir -p "$out/lib" + ln -s lib "$out/lib64" + mkdir -p "$lib/lib" + ln -s lib "$lib/lib64" fi } postInstall() { - mkdir -p "$lib" # some configs don't have anything to put into $lib - # Move runtime libraries to $lib. moveToOutput "lib/lib*.so*" "$lib" moveToOutput "lib/lib*.la" "$lib" - if [ -d "$lib/lib" ]; then - ln -s lib "$lib/lib64" # for *.la - fi moveToOutput "share/gcc-*/python" "$lib" for i in "$lib"/lib/*.{la,py}; do diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix index 66f273482cfb..7fa58a053b44 100644 --- a/pkgs/development/compilers/gcc/gfortran-darwin.nix +++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix @@ -21,10 +21,10 @@ 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} + --with-mpfr=${mpfr.dev} --with-native-system-header-dir=${Libsystem}/include --with-system-zlib ''; diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 77e5229a2a0a..f0f54252b3fc 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 or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/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..07137578585d 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 or gmp}/lib --with-gmp-includes=${gmp.dev or gmp}/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 f129e8503673..612c237735c3 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -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" ]; diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 23f0484e8ead..eb9e5f7d3627 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { MYSQL_DIR=mariadb; # work around broken build system - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; prePatch = '' substituteInPlace hphp/util/generate-buildinfo.sh \ diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 59e8055efb20..7471974d00a1 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_REQUIRES_RTTI=1" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index f16b6981dea5..64df30dc23f9 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix index 2ccf9d1ed712..5941d7883565 100644 --- a/pkgs/development/compilers/llvm/3.6/llvm.nix +++ b/pkgs/development/compilers/llvm/3.6/llvm.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DCMAKE_CXX_FLAGS=-stdlib=libc++" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index be527d873754..3a7829eca6df 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries "-DBUILD_SHARED_LIBS=ON" ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index f586fd0c7528..ef929dec68ba 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 74f85b1519c6..de9339bb8a28 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { cmakeFlags = with stdenv; [ "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 66e62f8965e6..0e26526ba161 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ./autogen.sh ''; - configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc}"; + configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.dev}"; buildPhase = "make 3-stage-bootstrap"; postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin"; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 5fbfd8a96ac9..eebc8a56765b 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure ''; - configureFlags = "--with-openssl=${openssl}"; + configureFlags = "--with-openssl=${openssl.dev}"; preConfigure = '' export PGHEADER="${postgresql}/include/libpq-fe.h"; |