From 493349f82aac9aecebb9264ef2748fc32d8aa266 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:29 +0200 Subject: [PATCH] treewide: Mass replace 'libjpeg}/lib' to refer the 'out' output --- pkgs/applications/video/avxsynth/default.nix | 2 +- pkgs/tools/graphics/graphviz/2.0.nix | 2 +- pkgs/tools/graphics/graphviz/2.32.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index d8ec715a38cb..06dcaf31b443 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--enable-subtitle" "--enable-ffms2" (enableFeature avxeditSupport "avxedit") - "--with-jpeg=${libjpeg}/lib" + "--with-jpeg=${libjpeg.out}/lib" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 263a3d965f84..0e261837c8da 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { [ "--with-pngincludedir=${libpng}/include" "--with-pnglibdir=${libpng}/lib" "--with-jpegincludedir=${libjpeg}/include" - "--with-jpeglibdir=${libjpeg}/lib" + "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat}/include" "--with-expatlibdir=${expat.out}/lib" ] diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index c8da74d02226..3642f83b7fb9 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { [ "--with-pngincludedir=${libpng}/include" "--with-pnglibdir=${libpng}/lib" "--with-jpegincludedir=${libjpeg}/include" - "--with-jpeglibdir=${libjpeg}/lib" + "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat}/include" "--with-expatlibdir=${expat.out}/lib" "--with-cgraph=no"