From 942db2e9acab06d3199463aa36be1a9c7e615d93 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 4 May 2016 17:54:52 +0200 Subject: [PATCH] imagemagick: libwebp just has to be a propagated input --- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- 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 b97eb5a6580..47f60ed7ec1 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 e16d1c888c4..48e3316a4a2 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"];