mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 06:14:26 +03:00
Merge pull request #7746 from mdorman/calibre_pdf
Fix calibre PDF handling
This commit is contained in:
commit
53148b24f6
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler, pkgconfig, libpng
|
{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
|
||||||
, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite
|
, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite
|
||||||
, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
|
, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
|
||||||
, xdg_utils
|
, xdg_utils
|
||||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||||||
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ python pyqt5 sip_4_16 poppler libpng imagemagick libjpeg
|
[ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
|
||||||
fontconfig podofo qt5 pil chmlib icu sqlite libusb1 libmtp xdg_utils
|
fontconfig podofo qt5 pil chmlib icu sqlite libusb1 libmtp xdg_utils
|
||||||
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
|
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
|
||||||
pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
|
pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
|
||||||
@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
export HOME=$TMPDIR/fakehome
|
export HOME=$TMPDIR/fakehome
|
||||||
export POPPLER_INC_DIR=${poppler}/include/poppler
|
export POPPLER_INC_DIR=${poppler_utils}/include/poppler
|
||||||
export POPPLER_LIB_DIR=${poppler}/lib
|
export POPPLER_LIB_DIR=${poppler_utils}/lib
|
||||||
export MAGICK_INC=${imagemagick}/include/ImageMagick
|
export MAGICK_INC=${imagemagick}/include/ImageMagick
|
||||||
export MAGICK_LIB=${imagemagick}/lib
|
export MAGICK_LIB=${imagemagick}/lib
|
||||||
export FC_INC_DIR=${fontconfig}/include/fontconfig
|
export FC_INC_DIR=${fontconfig}/include/fontconfig
|
||||||
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||||||
for a in $out/bin/*; do
|
for a in $out/bin/*; do
|
||||||
wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \
|
wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \
|
||||||
--prefix LD_LIBRARY_PATH : ${unrar}/lib \
|
--prefix LD_LIBRARY_PATH : ${unrar}/lib \
|
||||||
--prefix PATH : ${poppler}/bin
|
--prefix PATH : ${poppler_utils}/bin
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user