diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-09-17 18:45:13 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2019-09-19 07:39:11 -0500 |
| commit | bddca5a91a82197596ab69dad374e8251edd6d00 (patch) | |
| tree | de8700ceef91879e4d63853ec3d6e8580e55be03 /pkgs | |
| parent | e4e34190966c401d5f3784a704e3a266d0419231 (diff) | |
| download | nixpkgs-bddca5a91a82197596ab69dad374e8251edd6d00.tar nixpkgs-bddca5a91a82197596ab69dad374e8251edd6d00.tar.gz nixpkgs-bddca5a91a82197596ab69dad374e8251edd6d00.tar.bz2 nixpkgs-bddca5a91a82197596ab69dad374e8251edd6d00.tar.lz nixpkgs-bddca5a91a82197596ab69dad374e8251edd6d00.tar.xz nixpkgs-bddca5a91a82197596ab69dad374e8251edd6d00.tar.zst nixpkgs-bddca5a91a82197596ab69dad374e8251edd6d00.zip | |
qmake-hook.sh: qmakeFlags is an array
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/hooks/qmake-hook.sh | 27 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh | 2 |
2 files changed, 20 insertions, 9 deletions
diff --git a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index eef2c7d24df..f6d332f29ba 100644 --- a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -1,14 +1,25 @@ +qmakeFlags=( $qmakeFlags ) + +qmakePrePhase() { + qmakeFlags=( \ + "PREFIX=$out" \ + "NIX_OUTPUT_OUT=$out" \ + "NIX_OUTPUT_DEV=${!outputDev}" \ + "NIX_OUTPUT_BIN=${!outputBin}" \ + "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \ + "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ + "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" \ + "${qmakeFlags[@]}" \ + ) +} +prePhases+=" qmakePrePhase" + qmakeConfigurePhase() { runHook preConfigure - qmake PREFIX=$out \ - NIX_OUTPUT_OUT=$out \ - NIX_OUTPUT_DEV=${!outputDev} \ - NIX_OUTPUT_BIN=${!outputBin} \ - NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?} \ - NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?} \ - NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?} \ - $qmakeFlags + echo "QMAKEPATH=$QMAKEPATH" + echo qmake "${qmakeFlags[@]}" + qmake "${qmakeFlags[@]}" if ! [[ -v enableParallelBuilding ]]; then enableParallelBuilding=1 diff --git a/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh index b09cf5f46c9..c320a797447 100644 --- a/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh @@ -1 +1 @@ -qmakeFlags="$qmakeFlags${qmakeFlags:+ }QMAKE_LRELEASE=@dev@/bin/lrelease" +qmakeFlags+=( "QMAKE_LRELEASE=@dev@/bin/lrelease" ) |