diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:29:29 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:35 +0200 |
| commit | 493349f82aac9aecebb9264ef2748fc32d8aa266 (patch) | |
| tree | 1e1d858f6bc7532b0183633b0e4d1a1e917172c1 | |
| parent | 8707bf4a3ca5459cc4d3cec5880df6f55fe73067 (diff) | |
| download | nixpkgs-493349f82aac9aecebb9264ef2748fc32d8aa266.tar nixpkgs-493349f82aac9aecebb9264ef2748fc32d8aa266.tar.gz nixpkgs-493349f82aac9aecebb9264ef2748fc32d8aa266.tar.bz2 nixpkgs-493349f82aac9aecebb9264ef2748fc32d8aa266.tar.lz nixpkgs-493349f82aac9aecebb9264ef2748fc32d8aa266.tar.xz nixpkgs-493349f82aac9aecebb9264ef2748fc32d8aa266.tar.zst nixpkgs-493349f82aac9aecebb9264ef2748fc32d8aa266.zip | |
treewide: Mass replace 'libjpeg}/lib' to refer the 'out' output
| -rw-r--r-- | pkgs/applications/video/avxsynth/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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index d8ec715a38c..06dcaf31b44 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 263a3d965f8..0e261837c8d 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 c8da74d0222..3642f83b7fb 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" |