diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-25 20:37:47 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-25 20:38:57 +0200 |
| commit | ede605e4f1b651ac61f913638fe69698dd7a33ae (patch) | |
| tree | f73adcd3a65a611c071667752efc7c4f249bafd9 /pkgs/applications/misc/calibre/default.nix | |
| parent | 79a215e78d9c3dec421a7a6a088431b2153f3532 (diff) | |
| download | nixpkgs-ede605e4f1b651ac61f913638fe69698dd7a33ae.tar nixpkgs-ede605e4f1b651ac61f913638fe69698dd7a33ae.tar.gz nixpkgs-ede605e4f1b651ac61f913638fe69698dd7a33ae.tar.bz2 nixpkgs-ede605e4f1b651ac61f913638fe69698dd7a33ae.tar.lz nixpkgs-ede605e4f1b651ac61f913638fe69698dd7a33ae.tar.xz nixpkgs-ede605e4f1b651ac61f913638fe69698dd7a33ae.tar.zst nixpkgs-ede605e4f1b651ac61f913638fe69698dd7a33ae.zip | |
calibre: fix #14938 build
Thanks to a hack and qmake help from @ttuegel.
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 d7ab712dae6..7c6f3cfdffb 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 |