mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 07:31:20 +00:00
calibre: really fix building on master
It turns out I hardcoded the output path that qt's tarball extracts. But that path is versioned (4.8.5 for example). As I've already merged x-updates on my own system, my qt version was different (4.8.4 vs 4.8.5). Made the path-guessing more flexible, so now it should work with any 4.8.*
This commit is contained in:
parent
dd51b43164
commit
946f219a32
|
@ -18,8 +18,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patchPhase = ''
|
||||
tar xf ${qt48.src}
|
||||
qtdir=$(realpath $(ls | grep qt | grep 4.8 | grep src))
|
||||
sed -i setup/build_environment.py \
|
||||
-e "s|^qt_private_inc = .*|qt_private_inc = ['../qt-everywhere-opensource-src-4.8.5/include/%s'%(m) for m in ('QtGui', 'QtCore')]|"
|
||||
-e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s\'%(m) for m in ('QtGui', 'QtCore')]|"
|
||||
'';
|
||||
|
||||
buildInputs =
|
||||
|
|
Loading…
Reference in a new issue