public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtbase: Create .qmake.stash if missing

Browse Source
This commit is contained in:
Thomas Tuegel 2019-09-16 05:58:28 -05:00
parent 36a8cfc874
commit e4e3419096
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -32,7 +32,7 @@ assert withGtk3 -> gtk3 != null;
let let
compareVersion = v: builtins.compareVersions version v; compareVersion = v: builtins.compareVersions version v;
qmakeCacheName = 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 in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -49,7 +49,7 @@ stdenv.mkDerivation {
# Image formats # Image formats
libjpeg libpng libtiff 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 if stdenv.isDarwin
@ -179,8 +179,10 @@ stdenv.mkDerivation {
postConfigure = '' postConfigure = ''
qmakeCacheInjectNixOutputs() { qmakeCacheInjectNixOutputs() {
local cache="$1/${qmakeCacheName}" local cache="$1/${qmakeCacheName}"
if ! [ -f "$cache" ]; then return; fi
echo "qmakeCacheInjectNixOutputs: $cache" echo "qmakeCacheInjectNixOutputs: $cache"
if ! [ -f "$cache" ]; then
echo >&2 "qmakeCacheInjectNixOutputs: WARNING: $cache does not exist"
fi
cat >>"$cache" <<EOF cat >>"$cache" <<EOF
NIX_OUTPUT_BIN = $bin NIX_OUTPUT_BIN = $bin
NIX_OUTPUT_DEV = $dev NIX_OUTPUT_DEV = $dev