From 6610fd532973f8d6c63e2f70f63370b980ca9502 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 25 Nov 2015 18:28:57 +0300 Subject: [PATCH] mupdf: propagate needed libraries --- pkgs/applications/misc/mupdf/default.nix | 4 +++- pkgs/applications/misc/zathura/pdf-mupdf/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index dd432f0c474..a2fdd33747b 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "01n26cy41lc2fjri63s4js23ixxb4nd37aafry3hz4i4id6wd8x2"; }; - buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ openjpeg libjpeg jbig2dec ]; + buildInputs = [ zlib freetype libX11 libXext ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index e7232c2dc58..ad5993cf581 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }: +{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl }: stdenv.mkDerivation rec { version = "0.2.8"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0439ls8xqnq6hqa53hd0wqxh1qf0xmccfi3pb0m4mlfs5iv952wz"; }; - buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf openjpeg libjpeg jbig2dec ]; + buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf ]; makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];