From 8bbc3fe8014d0f0e34dcc2ef011c27ea3a9f0fb8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 16 Apr 2016 19:49:30 +0300 Subject: treewide: Make explicit that 'dev' output of expat is used --- pkgs/tools/graphics/graphviz/2.0.nix | 2 +- pkgs/tools/graphics/graphviz/2.32.nix | 2 +- pkgs/tools/networking/unbound/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools') 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" -- cgit 1.4.1