diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 19:49:30 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:30 +0200 |
| commit | 8bbc3fe8014d0f0e34dcc2ef011c27ea3a9f0fb8 (patch) | |
| tree | 2dcf1c155b0dcb81502ba58cbb541cd01177b6c6 /pkgs | |
| parent | 4e0307dcfc4674f733bbb3e93dbe15ae910258e2 (diff) | |
| download | nixlib-8bbc3fe8014d0f0e34dcc2ef011c27ea3a9f0fb8.tar nixlib-8bbc3fe8014d0f0e34dcc2ef011c27ea3a9f0fb8.tar.gz nixlib-8bbc3fe8014d0f0e34dcc2ef011c27ea3a9f0fb8.tar.bz2 nixlib-8bbc3fe8014d0f0e34dcc2ef011c27ea3a9f0fb8.tar.lz nixlib-8bbc3fe8014d0f0e34dcc2ef011c27ea3a9f0fb8.tar.xz nixlib-8bbc3fe8014d0f0e34dcc2ef011c27ea3a9f0fb8.tar.zst nixlib-8bbc3fe8014d0f0e34dcc2ef011c27ea3a9f0fb8.zip | |
treewide: Make explicit that 'dev' output of expat is used
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/apr-util/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/gdb/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/graphviz/2.0.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/graphviz/2.32.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/unbound/default.nix | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 24483227d221..d1fe8af08c1f 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { 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 sslSupport "--with-openssl=${openssl}" ++ optional bdbSupport "--with-berkeley-db=${db}" diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 472bb4de58b9..32dcd72866ea 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { configureFlags = with stdenv.lib; [ "--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" ] ++ optional (target != null) "--target=${target.config}" diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 02b700111de3..9799c83c8223 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg}/include" "--with-jpeglibdir=${libjpeg.out}/lib" - "--with-expatincludedir=${expat}/include" + "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" ] ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 8a7205621673..aa0f02d34c36 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg}/include" "--with-jpeglibdir=${libjpeg.out}/lib" - "--with-expatincludedir=${expat}/include" + "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" "--with-cgraph=no" "--with-sparse=no" diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index f639044a195d..684b9b13a804 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ssl=${openssl.dev}" - "--with-libexpat=${expat}" + "--with-libexpat=${expat.dev}" "--with-libevent=${libevent.dev}" "--localstatedir=/var" "--sysconfdir=/etc" |