diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-09-16 05:58:28 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2019-09-19 07:39:10 -0500 |
| commit | e4e34190966c401d5f3784a704e3a266d0419231 (patch) | |
| tree | 49819a04f90b41e101623b8a30c29373c2f9d2d3 /pkgs/development/libraries/qt-5/modules | |
| parent | 36a8cfc874aa09323abc4a55983e77b5e1061b1f (diff) | |
qtbase: Create .qmake.stash if missing
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 362058736b0b3..b09ceaf056c77 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -32,7 +32,7 @@ assert withGtk3 -> gtk3 != null; let compareVersion = v: builtins.compareVersions version v; qmakeCacheName = - if compareVersion "5.12.4" >= 0 then ".qmake.stash" else ".qmake.cache"; + if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash"; in stdenv.mkDerivation { @@ -49,7 +49,7 @@ stdenv.mkDerivation { # Image formats libjpeg libpng libtiff - (if compareVersion "5.9.0" >= 0 then pcre2 else pcre16) + (if compareVersion "5.9.0" < 0 then pcre16 else pcre2) ] ++ ( if stdenv.isDarwin @@ -179,8 +179,10 @@ stdenv.mkDerivation { postConfigure = '' qmakeCacheInjectNixOutputs() { local cache="$1/${qmakeCacheName}" - if ! [ -f "$cache" ]; then return; fi echo "qmakeCacheInjectNixOutputs: $cache" + if ! [ -f "$cache" ]; then + echo >&2 "qmakeCacheInjectNixOutputs: WARNING: $cache does not exist" + fi cat >>"$cache" <<EOF NIX_OUTPUT_BIN = $bin NIX_OUTPUT_DEV = $dev |