From eabe2efa10b909de0f185f8c74cd4a71bafc58e1 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 7 Aug 2017 17:32:30 +0300 Subject: [PATCH] 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. --- pkgs/development/libraries/qt-5/qtbase-setup-hook.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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