diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-09-23 07:18:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-23 07:18:25 -0500 |
| commit | 5eb2c7a753b91f56adcf325ba00b27cd79accd27 (patch) | |
| tree | 666e093bc6e90db43619dfeb458f15a94393c0b1 /pkgs/development/libraries/qt-5 | |
| parent | 73282c8cc2cdc866c26fd280d6ba061e6a2870f5 (diff) | |
| parent | a830aa3af026ea6186becb12a6ed612a2fda6186 (diff) | |
| download | nixpkgs-5eb2c7a753b91f56adcf325ba00b27cd79accd27.tar nixpkgs-5eb2c7a753b91f56adcf325ba00b27cd79accd27.tar.gz nixpkgs-5eb2c7a753b91f56adcf325ba00b27cd79accd27.tar.bz2 nixpkgs-5eb2c7a753b91f56adcf325ba00b27cd79accd27.tar.lz nixpkgs-5eb2c7a753b91f56adcf325ba00b27cd79accd27.tar.xz nixpkgs-5eb2c7a753b91f56adcf325ba00b27cd79accd27.tar.zst nixpkgs-5eb2c7a753b91f56adcf325ba00b27cd79accd27.zip | |
Merge pull request #28237 from avnik/qt5-mktemp
qt5: use `mktemp -d` to create fake Qt prefix in nix-shell
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/qtbase-setup-hook.sh | 13 |
1 files changed, 12 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 e080d99a4aa..e4ef456bf97 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 @@ -142,3 +146,10 @@ EOF export QMAKE="$NIX_QT5_TMP/bin/qmake" fi +_qtShellCleanupHook () { + rm -fr $NIX_QT5_TMP +} + +if [ -n "$IN_NIX_SHELL" ]; then + trap _qtShellCleanupHook EXIT +fi |