diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-08-17 19:35:29 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-08-17 20:30:51 +0300 |
| commit | 3e5bf44aabca6c429bc953da51edf5b7b56c72ef (patch) | |
| tree | 4454a74ea0c1116f56e09a4fb1be3fa8b193df98 /pkgs/applications/misc/calibre | |
| parent | 1c5399626a4e5a32269fce7ed15dff8f32558b54 (diff) | |
| download | nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar.gz nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar.bz2 nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar.lz nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar.xz nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.tar.zst nixlib-3e5bf44aabca6c429bc953da51edf5b7b56c72ef.zip | |
sip: 4.14.7 -> 4.18.1, drop unused old version
Diffstat (limited to 'pkgs/applications/misc/calibre')
| -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 5f16cb7b9efa..f0867e48ff68 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng +{ stdenv, fetchurl, python, pyqt5, sip, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite , makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils, makeDesktopItem @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; buildInputs = - [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg + [ python pyqt5 sip poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo}/include/podofo export PODOFO_LIB_DIR=${podofo}/lib - export SIP_BIN=${sip_4_16}/bin/sip + export SIP_BIN=${sip}/bin/sip python setup.py install --prefix=$out PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py |