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

Merge branch 'staging'

Browse Source 
Includes a security update of libxml2.
This commit is contained in:
Vladimír Čunát
2016-05-27 15:37:04 +02:00
parent 60a890e35b dc13593b9f
commit e4832c7541
234 changed files with 444 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/aliceml/default.nix
View File

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

4
pkgs/development/compilers/ecl/default.nix
View File

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

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

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

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

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

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

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

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

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

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

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

13
pkgs/development/compilers/gcc/builder.sh
View File

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

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

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

2
pkgs/development/compilers/ghc/7.0.4-binary.nix
View File

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

2
pkgs/development/compilers/ghc/7.4.2-binary.nix
View File

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

4
pkgs/development/compilers/ghc/8.0.1.nix
View File

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

2
pkgs/development/compilers/hhvm/default.nix
View File

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

2
pkgs/development/compilers/llvm/3.4/llvm.nix
View File

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

2
pkgs/development/compilers/llvm/3.5/llvm.nix
View File

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

2
pkgs/development/compilers/llvm/3.6/llvm.nix
View File

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

2
pkgs/development/compilers/llvm/3.7/llvm.nix
View File

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

2
pkgs/development/compilers/llvm/3.8/llvm.nix
View File

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

2
pkgs/development/compilers/mono/llvm.nix
View File

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

2
pkgs/development/compilers/opendylan/default.nix
View File

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

2
pkgs/development/compilers/urweb/default.nix
View File

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

2
pkgs/development/interpreters/erlang/R16.nix
View File

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
sed -e s@/bin/pwd@pwd@g -i otp_build
'';
configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
configureFlags= "--with-ssl=${openssl.dev} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
postInstall = let
manpages = fetchurl {

2
pkgs/development/interpreters/erlang/R17.nix
View File

@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
'';
configureFlags= [
"--with-ssl=${openssl}"
"--with-ssl=${openssl.dev}"
] ++ optional enableHipe "--enable-hipe"
++ optional wxSupport "--enable-wx"
++ optional odbcSupport "--with-odbc=${unixODBC}"

2
pkgs/development/interpreters/erlang/R18.nix
View File

@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
'';
configureFlags= [
"--with-ssl=${openssl}"
"--with-ssl=${openssl.dev}"
] ++ optional enableHipe "--enable-hipe"
++ optional wxSupport "--enable-wx"
++ optional odbcSupport "--with-odbc=${unixODBC}"

4
pkgs/development/interpreters/guile/default.nix
View File

@@ -97,10 +97,10 @@
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
# for details.
"--with-libgmp-prefix=${gmp}"
"--with-libgmp-prefix=${gmp.dev}"
# Same for these (?).
"--with-libreadline-prefix=${readline}"
"--with-libreadline-prefix=${readline.dev}"
"--with-libunistring-prefix=${libunistring}"
# See below.

2
pkgs/development/interpreters/love/0.7.nix
View File

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = ''
-I${SDL}/include/SDL
-I${freetype}include/freetype2
-I${freetype.dev}include/freetype2
'';
meta = {

2
pkgs/development/interpreters/love/0.8.nix
View File

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = ''
-I${SDL.dev}/include/SDL
-I${freetype}include/freetype2
-I${freetype.dev}include/freetype2
'';
meta = {

20
pkgs/development/interpreters/php/default.nix
View File

@@ -60,7 +60,7 @@ let
};
curl = {
configureFlags = ["--with-curl=${curl}"];
configureFlags = ["--with-curl=${curl.dev}"];
buildInputs = [curl openssl];
};
@@ -69,7 +69,7 @@ let
};
zlib = {
configureFlags = ["--with-zlib=${zlib}"];
configureFlags = ["--with-zlib=${zlib.dev}"];
buildInputs = [zlib];
};
@@ -85,12 +85,12 @@ let
};
readline = {
configureFlags = ["--with-readline=${readline}"];
configureFlags = ["--with-readline=${readline.dev}"];
buildInputs = [ readline ];
};
sqlite = {
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
configureFlags = ["--with-pdo-sqlite=${sqlite.dev}"];
buildInputs = [ sqlite ];
};
@@ -133,15 +133,15 @@ let
# FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
configureFlags = [
"--with-gd"
"--with-freetype-dir=${freetype}"
"--with-png-dir=${libpng}"
"--with-jpeg-dir=${libjpeg}"
"--with-freetype-dir=${freetype.dev}"
"--with-png-dir=${libpng.dev}"
"--with-jpeg-dir=${libjpeg.dev}"
];
buildInputs = [ libpng libjpeg freetype ];
};
gmp = {
configureFlags = ["--with-gmp=${gmp}"];
configureFlags = ["--with-gmp=${gmp.dev}"];
buildInputs = [ gmp ];
};
@@ -177,7 +177,7 @@ let
};
xsl = {
configureFlags = ["--with-xsl=${libxslt}"];
configureFlags = ["--with-xsl=${libxslt.dev}"];
buildInputs = [libxslt];
};
@@ -187,7 +187,7 @@ let
};
bz2 = {
configureFlags = ["--with-bz2=${bzip2}"];
configureFlags = ["--with-bz2=${bzip2.dev}"];
buildInputs = [bzip2];
};

2
pkgs/development/interpreters/pixie/default.nix
View File

@@ -47,7 +47,7 @@ let
patchPhase = ''
(cd pixie-src
patch -p1 < ${./load_paths.patch}
libraryPaths='["${libuv}" "${libedit}" "${libffi}" "${boost.dev}" "${boost.out}" "${zlib}"]'
libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]'
export libraryPaths
substituteAllInPlace ./pixie/ffi-infer.pxi)
'';

2
pkgs/development/libraries/aalib/default.nix
View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation {
buildInputs = [ ncurses ];
configureFlags = "--without-x --with-ncurses=${ncurses}";
configureFlags = "--without-x --with-ncurses=${ncurses.dev}";
postInstall = ''
mkdir -p $dev/bin

4
pkgs/development/libraries/apr-util/default.nix
View File

@@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
buildInputs = optional stdenv.isFreeBSD autoreconfHook;
configureFlags = [ "--with-apr=${apr}" "--with-expat=${expat}" ]
configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ]
++ optional (!stdenv.isCygwin) "--with-crypto"
++ optional sslSupport "--with-openssl=${openssl}"
++ optional sslSupport "--with-openssl=${openssl.dev}"
++ optional bdbSupport "--with-berkeley-db=${db}"
++ optional ldapSupport "--with-ldap=ldap"
++ optionals stdenv.isCygwin

4
pkgs/development/libraries/at-spi2-atk/default.nix
View File

@@ -2,14 +2,14 @@
, intltool, dbus_glib, at_spi2_core, libSM }:
stdenv.mkDerivation rec {
versionMajor = "2.18";
versionMajor = "2.20";
versionMinor = "1";
moduleName = "at-spi2-atk";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "0bf1g5cj84rmx7p1q547vwbc0hlpcs2wrxnmv96lckfkhs9mzcf4";
sha256 = "2358a794e918e8f47ce0c7370eee8fc8a6207ff1afe976ec9ff547a03277bf8e";
};
buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi

6
pkgs/development/libraries/at-spi2-core/default.nix
View File

@@ -2,14 +2,14 @@
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
stdenv.mkDerivation rec {
versionMajor = "2.18";
versionMinor = "3";
versionMajor = "2.20";
versionMinor = "1";
moduleName = "at-spi2-core";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "0afn4x04j5l352vj0dccb2hkpzg3l2vhr8h1yv89fpqmjkfnm8md";
sha256 = "6ed858e781f5aa9a9662b3beb5ef82f733dac040afc8255d85dffd2097f16900";
};
outputs = [ "dev" "out" ];

4
pkgs/development/libraries/atk/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
let
ver_maj = "2.18";
ver_maj = "2.20";
ver_min = "0";
in
stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
sha256 = "ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b";
sha256 = "493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0";
};
enableParallelBuilding = true;

2
pkgs/development/libraries/coprthr/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--with-libelf=${libelf}"
"--with-libevent=${libevent}"
"--with-libevent=${libevent.dev}"
"--with-libconfig=${libconfig}"
"--with-opencl-icd-path=$out/etc/OpenCL/vendors"
"--enable-user-install"

2
pkgs/development/libraries/cyrus-sasl/default.nix
View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
);
configureFlags = [
"--with-openssl=${openssl}"
"--with-openssl=${openssl.dev}"
];
# Set this variable at build-time to make sure $out can be evaluated.

4
pkgs/development/libraries/dbus-glib/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
stdenv.mkDerivation rec {
name = "dbus-glib-0.104";
name = "dbus-glib-0.106";
src = fetchurl {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz";
sha256 = "0in0i6v68ixcy0ip28i84hdczf10ykq9x682qgcvls6gdmq552dk";
};
outputs = [ "dev" "out" "docdev" ];

8
pkgs/development/libraries/gdal/default.nix
View File

@@ -29,10 +29,10 @@ composableDerivation.composableDerivation {} (fixed: rec {
preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
configureFlags = [
"--with-jpeg=${libjpeg}"
"--with-libtiff=${libtiff}" # optional (without largetiff support)
"--with-libpng=${libpng}" # optional
"--with-libz=${zlib}" # optional
"--with-jpeg=${libjpeg.dev}"
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
"--with-libpng=${libpng.dev}" # optional
"--with-libz=${zlib.dev}" # optional
"--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${mysql.lib}/bin/mysql_config"

8
pkgs/development/libraries/gdal/gdal-1_11.nix
View File

@@ -24,10 +24,10 @@ composableDerivation.composableDerivation {} (fixed: rec {
preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
configureFlags = [
"--with-jpeg=${libjpeg}"
"--with-libtiff=${libtiff}" # optional (without largetiff support)
"--with-libpng=${libpng}" # optional
"--with-libz=${zlib}" # optional
"--with-jpeg=${libjpeg.dev}"
"--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
"--with-libpng=${libpng.dev}" # optional
"--with-libz=${zlib.dev}" # optional
"--with-pg=${postgresql}/bin/pg_config"
"--with-mysql=${mysql.lib}/bin/mysql_config"

2
pkgs/development/libraries/ggz_base_libs/default.nix
View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ intltool openssl expat libgcrypt ];
configureFlags = [
"--with-ssl-dir=${openssl}/"
"--with-ssl-dir=${openssl.dev}/"
"--with-tls"
];

4
pkgs/development/libraries/glib/default.nix
View File

@@ -40,7 +40,7 @@ let
'';
ver_maj = "2.48";
ver_min = "0";
ver_min = "1";
in
stdenv.mkDerivation rec {
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
sha256 = "0d3w2hblrw7vvpx60l1kbvb830ygn3v8zhwdz65cc5593j9ycjvl";
sha256 = "74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;

4
pkgs/development/libraries/gtk+/2.x.nix
View File

@@ -8,11 +8,11 @@ assert xineramaSupport -> xorg.libXinerama != null;
assert cupsSupport -> cups != null;
stdenv.mkDerivation rec {
name = "gtk+-2.24.29";
name = "gtk+-2.24.30";
src = fetchurl {
url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
sha256 = "1f1ifv1ijrda4jx831l24d3ww65v5gf56r464fi11n6k02bcah87";
sha256 = "0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50";
};
outputs = [ "dev" "out" "docdev" ];

4
pkgs/development/libraries/gtk+/3.x.nix
View File

@@ -12,7 +12,7 @@ with stdenv.lib;
let
ver_maj = "3.20";
ver_min = "3";
ver_min = "5";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "3834f3bf23b260b3e5ebfea41102e2026a8af29e36c3620edf4a5cf05e82f694";
sha256 = "9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564";
};
outputs = [ "dev" "out" ];

2
pkgs/development/libraries/gupnp/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ];
postInstall = ''
ln -sv ${libsoup}/include/*/libsoup $out/include
ln -sv ${libsoup.dev}/include/*/libsoup $out/include
ln -sv ${libxml2.dev}/include/*/libxml $out/include
ln -sv ${gssdp}/include/*/libgssdp $out/include
'';

4
pkgs/development/libraries/harfbuzz/default.nix
View File

@@ -5,7 +5,7 @@
}:
let
version = "1.1.2";
version = "1.2.7";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "07s6z3hbrb4rdfgzmln169wxz4nm5y7qbr02ik5c7drxpn85fb2a";
sha256 = "09lh8x6qj0cd950whgaqqi3c4pqbl6z7aw9ddm73i14bw056185v";
};
outputs = [ "dev" "out" ];

6
pkgs/development/libraries/kerberos/heimdal.nix
View File

@@ -32,13 +32,13 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc"
"--localstatedir=/var"
"--enable-hdb-openldap-module"
"--with-sqlite3=${sqlite}"
"--with-sqlite3=${sqlite.dev}"
"--with-libedit=${libedit}"
"--with-openssl=${openssl}"
"--with-openssl=${openssl.dev}"
"--without-x"
"--with-berkeley-db=${db}"
] ++ optionals (!libOnly) [
"--with-openldap=${openldap}"
"--with-openldap=${openldap.dev}"
] ++ optionals (!stdenv.isFreeBSD) [
"--with-capng"
];

2
pkgs/development/libraries/ldns/default.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl ];
buildInputs = [ openssl ];
configureFlags = [ "--with-ssl=${openssl}" "--with-drill" ];
configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill" ];
meta = with stdenv.lib; {
description = "Library with the aim of simplifying DNS programming in C";

2
pkgs/development/libraries/libclxclient/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libclthreads libX11 libXft xorg.xproto ];
NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft}/include";
NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft.dev}/include";
patchPhase = ''
sed -e "s@ldconfig@@" -i Makefile

4
pkgs/development/libraries/libdrm/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }:
stdenv.mkDerivation rec {
name = "libdrm-2.4.66";
name = "libdrm-2.4.68";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76";
sha256 = "5b4bd9a5922929bc716411cb74061fbf31b06ba36feb89bc1358a91a8d0ca9df";
};
outputs = [ "dev" "out" ];

2
pkgs/development/libraries/libksi/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl curl ];
configureFlags = [
"--with-openssl=${openssl}"
"--with-openssl=${openssl.dev}"
"--with-cafile=/etc/ssl/certs/ca-certificates.crt"
];

6
pkgs/development/libraries/libpng/default.nix
View File

@@ -3,11 +3,11 @@
assert zlib != null;
let
version = "1.6.20";
sha256 = "12wis4rlisfnw79pj2778m42m94xpi9nq8m385hxk11lkyg9biam";
version = "1.6.21";
sha256 = "10r0xqasm8fi0dx95bpca63ab4myb8g600ypyndj2r4jxd4ii3vc";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
sha256 = "11xgal9qk6fmqdgcb37xg55f2y58wizszw54p1pyq855d2xpwfz6";
sha256 = "0wwcc52yzjaxvpfkicz20j7yzpy02hpnsm4jjlvw74gy4qjhx9vd";
};
whenPatched = stdenv.lib.optionalString apngSupport;

15
pkgs/development/libraries/libxml2/default.nix
View File

@@ -1,13 +1,20 @@
{ stdenv, lib, fetchurl, zlib, xz, python, findXMLCatalogs, libiconv
{ stdenv, lib, fetchurl, zlib, xz, python, findXMLCatalogs, libiconv, fetchpatch
, supportPython ? (! stdenv ? cross) }:
stdenv.mkDerivation rec {
name = "libxml2-${version}";
version = "2.9.3";
version = "2.9.4";
src = fetchurl {
url = "http://xmlsoft.org/sources/${name}.tar.gz";
sha256 = "0bd17g6znn2r98gzpjppsqjg33iraky4px923j3k8kdl8qgy7sad";
sha256 = "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz";
};
# https://bugzilla.gnome.org/show_bug.cgi?id=766834#c5
postPatch = "patch -R < " + fetchpatch {
name = "schemas-validity.patch";
url = "https://git.gnome.org/browse/libxml2/patch/?id=f6599c5164";
sha256 = "0i7a0nhxwkxx6dkm8917qn0bsfn1av6ghg2f4dxanxi4bn4b1jjn";
};
outputs = [ "dev" "out" "bin" "doc" ]
@@ -27,6 +34,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = !stdenv.isDarwin;
crossAttrs = lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
# creating the DLL is broken ATM
dontDisableStatic = true;

4
pkgs/development/libraries/mesa/default.nix
View File

@@ -23,7 +23,7 @@ else
with { inherit (stdenv.lib) optional optionalString; };
let
version = "11.1.3";
version = "11.2.2";
# this is the default search path for DRI drivers
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
in
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
+ head (splitString "." version) + ''.x/${version}/mesa-${version}.tar.xz'')
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
];
sha256 = "51f6658a214d75e4d9f05207586d7ed56ebba75c6b10841176fb6675efa310ac";
sha256 = "40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4";
};
prePatch = "patchShebangs .";

2
pkgs/development/libraries/opencascade/6.5.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
# https://bugs.freedesktop.org/show_bug.cgi?id=83631
+ " -DGLX_GLXEXT_LEGACY";
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ];
configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype.dev}" ];
postInstall = ''
mv $out/inc $out/include

2
pkgs/development/libraries/opencascade/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
preUnpack = ''
sourceRoot=`pwd`/ros/adm/cmake
cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}"
cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype.dev}"
'';
# https://bugs.freedesktop.org/show_bug.cgi?id=83631

4
pkgs/development/libraries/pango/default.nix
View File

@@ -5,7 +5,7 @@
with stdenv.lib;
let
ver_maj = "1.38";
ver_maj = "1.40";
ver_min = "1";
in
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
sha256 = "1dsf45m51i4rcyvh5wlxxrjfhvn5b67d5ckjc6vdcxbddjgmc80k";
sha256 = "e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40";
};
outputs = [ "dev" "out" "bin" "docdev" ];

2
pkgs/development/libraries/postgis/default.nix
View File

@@ -96,7 +96,7 @@ in rec {
dontDisableStatic = true;
preConfigure = ''
sed -i 's@/usr/bin/file@${file}/bin/file@' configure
configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c}"
configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}"
'';
postConfigure = ''
sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ;

4
pkgs/development/libraries/serf/default.nix
View File

@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
'';
buildPhase = ''
scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr}"/bin/*-config)" \
APU="$(echo "${aprutil}"/bin/*-config)" CC="${
scons PREFIX="$out" OPENSSL="${openssl.dev}" ZLIB="${zlib.dev}" APR="$(echo "${apr.dev}"/bin/*-config)" \
APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${
if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
}" ${
if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\""

2
pkgs/development/libraries/silgraphite/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [pkgconfig freetype libXft pango fontconfig];
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
meta = {
description = "An advanced font engine";

2
pkgs/development/libraries/slang/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sed -i -e "s|/bin/ln|ln|" src/Makefile.in
sed -i -e "s|-ltermcap|-lncurses|" ./configure
'';
configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}";
configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}";
buildInputs = [ pcre libpng zlib readline ];
propagatedBuildInputs = [ ncurses ];

2
pkgs/development/libraries/swiften/default.nix
View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
patchShebangs ./scons
./scons openssl=${openssl} \
./scons openssl=${openssl.dev} \
boost_includedir=${boost.dev}/include \
boost_libdir=${boost.out}/lib \
boost_bundled_enable=false \

10
pkgs/development/libraries/xine-lib/default.nix
View File

@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "xine-lib-1.2.4";
name = "xine-lib-1.2.6";
src = fetchurl {
url = "mirror://sourceforge/xine/${name}.tar.xz";
sha256 = "1pdv7bs683ily548arv4wsxabslyf3x3laij5jb921dxyx71nnww";
sha256 = "01d0nv4zhr4k8id5n4rmw13llrjsv9dhwg1a773c1iqpi1ris15x";
};
nativeBuildInputs = [ pkgconfig perl ];
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec
];
NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss";
NIX_LDFLAGS = "-lxcb-shm";
propagatedBuildInputs = [zlib];
enableParallelBuilding = true;

2
pkgs/development/libraries/zeitgeist/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0";
};
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
configureScript = "./autogen.sh";

2
pkgs/development/ocaml-modules/camlzip/default.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation {
substitute ${./META} META --subst-var-by VERSION "${version}"
substituteInPlace Makefile \
--subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \
--subst-var-by ZLIB_INCLUDE "${zlib}/include"
--subst-var-by ZLIB_INCLUDE "${zlib.dev}/include"
'';
buildFlags = "all allopt";

2
pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
View File

@@ -11,7 +11,7 @@ buildPerlPackage rec {
preConfigure = ''
cat > config.in <<EOF
BUILD_ZLIB = False
INCLUDE = ${zlib}/include
INCLUDE = ${zlib.dev}/include
LIB = ${zlib.out}/lib
OLD_ZLIB = False
GZIP_OS_CODE = AUTO_DETECT

2
pkgs/development/perl-modules/DBD-SQLite/default.nix
View File

@@ -10,7 +10,7 @@ buildPerlPackage rec {
propagatedBuildInputs = [ DBI ];
makeMakerFlags = "SQLITE_LOCATION=${sqlite}";
makeMakerFlags = "SQLITE_LOCATION=${sqlite.dev}";
patches = [
# Support building against our own sqlite.

14
pkgs/development/python-modules/dbus/default.nix
View File

@@ -1,19 +1,23 @@
{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy }:
{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy
, ncurses }:
if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec {
name = "dbus-python-1.2.0";
name = "dbus-python-1.2.4";
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz";
sha256 = "1py62qir966lvdkngg0v8k1khsqxwk5m4s8nflpk1agk5f5nqb71";
sha256 = "1k7rnaqrk7mdkg0k6n2jn3d1mxsl7s3i07g5a8va5yvl3y3xdwg2";
};
postPatch = "patchShebangs .";
buildInputs = [ python pkgconfig dbus dbus_glib ]
++ stdenv.lib.optional doCheck dbus_tools;
++ stdenv.lib.optional doCheck dbus_tools
# My guess why it's sometimes trying to -lncurses.
# It seems not to retain the dependency anyway.
++ stdenv.lib.optional (! python ? modules) ncurses;
doCheck = false; # https://bugs.freedesktop.org/show_bug.cgi?id=57140
doCheck = true;
# Set empty pythonPath, so that the package is recognized as a python package
# for python.buildEnv

2
pkgs/development/python-modules/tables/default.nix
View File

@@ -18,7 +18,7 @@ buildPythonPackage rec {
setupPyBuildFlags =
[ "--hdf5=${hdf5}"
"--lzo=${lzo}"
"--bzip2=${bzip2}"
"--bzip2=${bzip2.dev}"
];
# Run the test suite.

4
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"
];
});
@@ -1922,7 +1922,7 @@ let
});
openssl = old.openssl.overrideDerivation (attrs: {
OPENSSL_INCLUDES = "${pkgs.openssl}/include";
OPENSSL_INCLUDES = "${pkgs.openssl.dev}/include";
});
Rserve = old.Rserve.overrideDerivation (attrs: {

2
pkgs/development/ruby-modules/gem-config/default.nix
View File

@@ -90,7 +90,7 @@ in
nokogiri = attrs: {
buildFlags = [
"--use-system-libraries"
"--with-zlib-dir=${zlib}"
"--with-zlib-dir=${zlib.dev}"
"--with-xml2-lib=${libxml2.out}/lib"
"--with-xml2-include=${libxml2.dev}/include/libxml2"
"--with-xslt-lib=${libxslt.out}/lib"

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

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
-"es|\"cscope-indexer\"|\"$out/libexec/cscope/cscope-indexer\"|g";
'';
configureFlags = "--with-ncurses=${ncurses}";
configureFlags = "--with-ncurses=${ncurses.dev}";
buildInputs = [ ncurses ];
nativeBuildInputs = [ pkgconfig emacs ];

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

@@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = with stdenv.lib;
[ "--with-gmp=${gmp}" "--with-mpfr=${mpfr}" "--with-system-readline"
"--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat}"
[ "--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"
]
++ optional (target != null) "--target=${target.config}"

4
pkgs/development/tools/misc/global/default.nix
View File

@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-ltdl-include=${libtool}/include"
"--with-ltdl-lib=${libtool.lib}/lib"
"--with-ncurses=${ncurses}"
"--with-sqlite3=${sqlite}"
"--with-ncurses=${ncurses.dev}"
"--with-sqlite3=${sqlite.dev}"
"--with-exuberant-ctags=${ctags}/bin/ctags"
"--with-posix-sort=${coreutils}/bin/sort"
];

2
pkgs/development/tools/misc/patchelf/setup-hook.sh
View File

@@ -6,6 +6,8 @@ fixupOutputHooks+=('if [ -z "$dontPatchELF" ]; then patchELF "$prefix"; fi')
patchELF() {
local dir="$1"
[ -e "$dir" ] || return 0
header "shrinking RPATHs of ELF executables and libraries in $dir"
local i

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

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1}/include/libusb-1.0";
cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ];

2
pkgs/development/tools/vagrant/default.nix
View File

@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
# curl: curl, curl-config
rm opt/vagrant/embedded/bin/{curl,curl-config}
ln -s ${curl.bin}/bin/curl opt/vagrant/embedded/bin
ln -s ${curl}/bin/curl-config opt/vagrant/embedded/bin
ln -s ${curl.dev}/bin/curl-config opt/vagrant/embedded/bin
# libarchive: bsdtar, bsdcpio
rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio}