mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 13:29:00 +02:00
calibre: fix #14938 build
Thanks to a hack and qmake help from @ttuegel.
This commit is contained in:
parent
79a215e78d
commit
ede605e4f1
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
|
{ 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
|
, makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp
|
||||||
, xdg_utils
|
, xdg_utils
|
||||||
}:
|
}:
|
||||||
|
@ -26,7 +26,14 @@ stdenv.mkDerivation rec {
|
||||||
setup/build_environment.py
|
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 =
|
buildInputs =
|
||||||
[ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
|
[ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
|
||||||
|
|
Loading…
Reference in a new issue