nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-25 05:23:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

calibre: really fix building on master

Browse Source 
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:
Mathijs Kwik 2013-08-25 23:41:15 +02:00
parent dd51b43164
commit 946f219a32
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/misc/calibre/default.nix
View File

@ -18,8 +18,9 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
tar xf ${qt48.src} tar xf ${qt48.src}
qtdir=$(realpath $(ls | grep qt | grep 4.8 | grep src))
sed -i setup/build_environment.py \ 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 = buildInputs =