MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 19:49:30 +03:00 committed by Vladimír Čunát
parent 4e0307dcfc
commit 8bbc3fe801
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/apr-util/default.nix
View file

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

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

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

2
pkgs/tools/graphics/graphviz/2.0.nix
View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
"--with-pnglibdir=${libpng.out}/lib" "--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg}/include" "--with-jpegincludedir=${libjpeg}/include"
"--with-jpeglibdir=${libjpeg.out}/lib" "--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat}/include" "--with-expatincludedir=${expat.dev}/include"
"--with-expatlibdir=${expat.out}/lib" "--with-expatlibdir=${expat.out}/lib"
] ]
++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x";

2
pkgs/tools/graphics/graphviz/2.32.nix
View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
"--with-pnglibdir=${libpng.out}/lib" "--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg}/include" "--with-jpegincludedir=${libjpeg}/include"
"--with-jpeglibdir=${libjpeg.out}/lib" "--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat}/include" "--with-expatincludedir=${expat.dev}/include"
"--with-expatlibdir=${expat.out}/lib" "--with-expatlibdir=${expat.out}/lib"
"--with-cgraph=no" "--with-cgraph=no"
"--with-sparse=no" "--with-sparse=no"

2
pkgs/tools/networking/unbound/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-ssl=${openssl.dev}" "--with-ssl=${openssl.dev}"
"--with-libexpat=${expat}" "--with-libexpat=${expat.dev}"
"--with-libevent=${libevent.dev}" "--with-libevent=${libevent.dev}"
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"