diff options
author | John Ericson <Ericson2314@yahoo.com> | 2017-11-22 15:23:37 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-22 15:23:37 -0500 |
commit | 405412dfd9394fc25680baa9d1d6296ba4ad91c4 (patch) | |
tree | 7507d67fed0ff963b1fa8928a29be80bb51cc1c9 /pkgs/development/libraries/qt-5 | |
parent | 9ae72f2715d800f25f7dca0dec69624968d52909 (diff) | |
parent | da19c34d0fd335424e734c3bec9ca87687eb15f0 (diff) | |
download | nixlib-405412dfd9394fc25680baa9d1d6296ba4ad91c4.tar nixlib-405412dfd9394fc25680baa9d1d6296ba4ad91c4.tar.gz nixlib-405412dfd9394fc25680baa9d1d6296ba4ad91c4.tar.bz2 nixlib-405412dfd9394fc25680baa9d1d6296ba4ad91c4.tar.lz nixlib-405412dfd9394fc25680baa9d1d6296ba4ad91c4.tar.xz nixlib-405412dfd9394fc25680baa9d1d6296ba4ad91c4.tar.zst nixlib-405412dfd9394fc25680baa9d1d6296ba4ad91c4.zip |
Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files
stdenv setup: Always use both propagated files
Diffstat (limited to 'pkgs/development/libraries/qt-5')
-rw-r--r-- | pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 258b2d09f20b..8ec7eeda8aee 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -33,29 +33,20 @@ addToQMAKEPATH() { # package depending on the building package. (This is necessary in case # the building package does not provide runtime dependencies itself and so # would not be propagated to the user environment.) -qtCrossEnvHook() { - addToQMAKEPATH "$1" - if providesQtRuntime "$1"; then - if [ "z${!outputBin}" != "z${!outputDev}" ]; then - propagatedBuildInputs+=" $1" - fi - propagatedUserEnvPkgs+=" $1" - fi -} -crossEnvHooks+=(qtCrossEnvHook) - qtEnvHook() { addToQMAKEPATH "$1" if providesQtRuntime "$1"; then if [ "z${!outputBin}" != "z${!outputDev}" ]; then - propagatedNativeBuildInputs+=" $1" + propagatedBuildInputs+=" $1" fi - if [ -z "$crossConfig" ]; then propagatedUserEnvPkgs+=" $1" - fi fi } -envHooks+=(qtEnvHook) +if [ "$crossConfig" ]; then + crossEnvHooks+=(qtEnvHook) +else + envHooks+=(qtEnvHook) +fi postPatchMkspecs() { local bin="${!outputBin}" |