diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2016-05-04 17:54:52 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2016-05-04 17:55:09 +0200 |
| commit | 942db2e9acab06d3199463aa36be1a9c7e615d93 (patch) | |
| tree | 4871b89c04d28dfd227bbcb78405ccc10c7bfcc1 /pkgs | |
| parent | 97a523d053edf8bdac5e333d91d68fe25bcd8436 (diff) | |
| download | nixlib-942db2e9acab06d3199463aa36be1a9c7e615d93.tar nixlib-942db2e9acab06d3199463aa36be1a9c7e615d93.tar.gz nixlib-942db2e9acab06d3199463aa36be1a9c7e615d93.tar.bz2 nixlib-942db2e9acab06d3199463aa36be1a9c7e615d93.tar.lz nixlib-942db2e9acab06d3199463aa36be1a9c7e615d93.tar.xz nixlib-942db2e9acab06d3199463aa36be1a9c7e615d93.tar.zst nixlib-942db2e9acab06d3199463aa36be1a9c7e615d93.zip | |
imagemagick: libwebp just has to be a propagated input
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/zbar/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index b97eb5a6580a..47f60ed7ec13 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = - [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ]; + [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 libwebp ]; postInstall = '' diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index e16d1c888c42..48e3316a4a24 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, imagemagickBig, pkgconfig, python, pygtk, perl -, libX11, libv4l, qt4, lzma, gtk2, libwebp +, libX11, libv4l, qt4, lzma, gtk2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagickBig pkgconfig python pygtk perl libX11 - libv4l qt4 lzma gtk2 libwebp ]; + libv4l qt4 lzma gtk2 ]; configureFlags = ["--disable-video"]; |