diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:29:09 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:34 +0200 |
commit | f9bf203837469eb7184c24ce9934d6f3b997c785 (patch) | |
tree | 487c67d887becc842d5b68e60a11995498d7e101 /pkgs/tools/graphics | |
parent | f12f6c86076618354f020f3b6634e46115794b40 (diff) | |
download | nixpkgs-f9bf203837469eb7184c24ce9934d6f3b997c785.tar nixpkgs-f9bf203837469eb7184c24ce9934d6f3b997c785.tar.gz nixpkgs-f9bf203837469eb7184c24ce9934d6f3b997c785.tar.bz2 nixpkgs-f9bf203837469eb7184c24ce9934d6f3b997c785.tar.lz nixpkgs-f9bf203837469eb7184c24ce9934d6f3b997c785.tar.xz nixpkgs-f9bf203837469eb7184c24ce9934d6f3b997c785.tar.zst nixpkgs-f9bf203837469eb7184c24ce9934d6f3b997c785.zip |
treewide: Mass replace 'expat}/lib' to refer the 'out' output
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/graphviz/2.0.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/graphviz/2.32.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 04fff805381..263a3d965f8 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--with-jpegincludedir=${libjpeg}/include" "--with-jpeglibdir=${libjpeg}/lib" "--with-expatincludedir=${expat}/include" - "--with-expatlibdir=${expat}/lib" + "--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 6eb8b5bceb2..c8da74d0222 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--with-jpegincludedir=${libjpeg}/include" "--with-jpeglibdir=${libjpeg}/lib" "--with-expatincludedir=${expat}/include" - "--with-expatlibdir=${expat}/lib" + "--with-expatlibdir=${expat.out}/lib" "--with-cgraph=no" "--with-sparse=no" ] |