diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:37:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:58:40 +0200 |
| commit | e4832c754114c5660909546ac749475bf63ff06e (patch) | |
| tree | fe77400566603caa218453ad5c7b6b9b5ea9715c /pkgs/applications/misc/calibre/default.nix | |
| parent | 60a890e35bc94ace092a2ec278534979fe6ee361 (diff) | |
| parent | dc13593b9fad3ea3728e2fd32f90841d5ec7662d (diff) | |
| download | nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.gz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.bz2 nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.lz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.xz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.zst nixlib-e4832c754114c5660909546ac749475bf63ff06e.zip | |
Merge branch 'staging'
Includes a security update of libxml2.
Diffstat (limited to 'pkgs/applications/misc/calibre/default.nix')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 3b8ab7f07f3c..83b782e65d6f 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { installPhase = '' export HOME=$TMPDIR/fakehome - export POPPLER_INC_DIR=${poppler_utils}/include/poppler + export POPPLER_INC_DIR=${poppler_utils.dev}/include/poppler export POPPLER_LIB_DIR=${poppler_utils.out}/lib - export MAGICK_INC=${imagemagick}/include/ImageMagick - export MAGICK_LIB=${imagemagick}/lib + export MAGICK_INC=${imagemagick.dev}/include/ImageMagick + export MAGICK_LIB=${imagemagick.out}/lib export FC_INC_DIR=${fontconfig.dev}/include/fontconfig export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo}/include/podofo |