diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-08-25 23:41:15 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-08-25 23:42:44 +0200 |
| commit | 946f219a32c8e776f10e698144427c0a2879d14a (patch) | |
| tree | 202b695ee4828ee60090455609ec6a38f8ce2d68 /pkgs/applications/misc/calibre | |
| parent | dd51b431649e17c94ba3a79d1455428a1fec2758 (diff) | |
| download | nixlib-946f219a32c8e776f10e698144427c0a2879d14a.tar nixlib-946f219a32c8e776f10e698144427c0a2879d14a.tar.gz nixlib-946f219a32c8e776f10e698144427c0a2879d14a.tar.bz2 nixlib-946f219a32c8e776f10e698144427c0a2879d14a.tar.lz nixlib-946f219a32c8e776f10e698144427c0a2879d14a.tar.xz nixlib-946f219a32c8e776f10e698144427c0a2879d14a.tar.zst nixlib-946f219a32c8e776f10e698144427c0a2879d14a.zip | |
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.*
Diffstat (limited to 'pkgs/applications/misc/calibre')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0987f961bafd..c74795f52c43 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -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 = |