diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2017-08-07 17:32:30 +0300 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2017-08-13 17:26:27 +0300 |
| commit | eabe2efa10b909de0f185f8c74cd4a71bafc58e1 (patch) | |
| tree | 75b06d0e1148a98c5db0fb56214a6db27a9c5ce4 /pkgs/development/libraries/qt-5 | |
| parent | ef026e02fcaa92323be875d8c7146b0b86e31880 (diff) | |
| download | nixpkgs-eabe2efa10b909de0f185f8c74cd4a71bafc58e1.tar nixpkgs-eabe2efa10b909de0f185f8c74cd4a71bafc58e1.tar.gz nixpkgs-eabe2efa10b909de0f185f8c74cd4a71bafc58e1.tar.bz2 nixpkgs-eabe2efa10b909de0f185f8c74cd4a71bafc58e1.tar.lz nixpkgs-eabe2efa10b909de0f185f8c74cd4a71bafc58e1.tar.xz nixpkgs-eabe2efa10b909de0f185f8c74cd4a71bafc58e1.tar.zst nixpkgs-eabe2efa10b909de0f185f8c74cd4a71bafc58e1.zip | |
qt5: Fallback to mktemp -d for temporary QT root.
Fallback to `mktemp -d` for temporary QT root, if invoked in shell mode. Should fix problem from #27174.
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/qtbase-setup-hook.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh index e7752af4397..4b0bad58335 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh @@ -116,7 +116,11 @@ fi if [ -z "$NIX_QT5_TMP" ]; then if [ -z "$NIX_QT_SUBMODULE" ]; then - NIX_QT5_TMP=$(pwd)/__nix_qt5__ + if [ -z "$IN_NIX_SHELL" ]; then + NIX_QT5_TMP=$(pwd)/__nix_qt5__ + else + NIX_QT5_TMP=$(mktemp -d) + fi else NIX_QT5_TMP=$out fi |