From f9bf203837469eb7184c24ce9934d6f3b997c785 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:09 +0200 Subject: treewide: Mass replace 'expat}/lib' to refer the 'out' output --- pkgs/tools/graphics/graphviz/2.0.nix | 2 +- pkgs/tools/graphics/graphviz/2.32.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 04fff8053819..263a3d965f84 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 6eb8b5bceb2e..c8da74d02226 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" ] -- cgit 1.4.1