From ede605e4f1b651ac61f913638fe69698dd7a33ae Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 25 Apr 2016 20:37:47 +0200 Subject: calibre: fix #14938 build Thanks to a hack and qmake help from @ttuegel. --- pkgs/applications/misc/calibre/default.nix | 11 +++++++++-- 1 file 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 -- cgit 1.4.1