diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:13:53 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:13:53 +0300 |
| commit | 4ff8f377afcfcb206c585f165dc1332c9fb1eba1 (patch) | |
| tree | 2df363c4be265610f3982377b3a1dc61870a544a /pkgs/applications/misc/calibre/default.nix | |
| parent | 7ac1ef05fa162d8e3c35925034df72288df77c8b (diff) | |
| parent | 49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4 (diff) | |
| download | nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.gz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.bz2 nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.lz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.xz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.zst nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/misc/calibre/default.nix')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d7ab712dae64..7c6f3cfdffb1 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qtbase, icu, sqlite +, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite , makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils }: @@ -26,7 +26,14 @@ stdenv.mkDerivation rec { setup/build_environment.py ''; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + dontUseQmakeConfigure = true; + # hack around a build problem + preBuild = '' + mkdir -p ../tmp.*/lib + ln -s '${qtbase.out}/lib/libQt5PlatformSupport.a' ../tmp.*/lib/ + ''; + + nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; buildInputs = [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg |