diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-17 13:26:21 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-21 10:44:44 -0500 |
commit | da19c34d0fd335424e734c3bec9ca87687eb15f0 (patch) | |
tree | d6ee6f1c3e16dfc3d3dab6226bfd9cff97e296de /pkgs/development/libraries/grantlee | |
parent | 652c2beda9a5351ddd07e422215100aca75412ae (diff) | |
download | nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.gz nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.bz2 nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.lz nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.xz nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.tar.zst nixpkgs-da19c34d0fd335424e734c3bec9ca87687eb15f0.zip |
stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by always including both propagated files: `propgated-native-build-inputs` and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still defined as before, however, so this change should only barely observable. This is an incremental step to fully keeping the dependencies separate in all cases.
Diffstat (limited to 'pkgs/development/libraries/grantlee')
-rw-r--r-- | pkgs/development/libraries/grantlee/5/setup-hook.sh | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/development/libraries/grantlee/5/setup-hook.sh index d11ef5883a1..aaa64868dc9 100644 --- a/pkgs/development/libraries/grantlee/5/setup-hook.sh +++ b/pkgs/development/libraries/grantlee/5/setup-hook.sh @@ -4,20 +4,14 @@ providesGrantleeRuntime() { [ -d "$1/$grantleePluginPrefix" ] } -_grantleeCrossEnvHook() { - if providesQtRuntime "$1"; then - propagatedBuildInputs+=" $1" - propagatedUserEnvPkgs+=" $1" - fi -} -crossEnvHooks+=(_grantleeCrossEnvHook) - _grantleeEnvHook() { if providesGrantleeRuntime "$1"; then - propagatedNativeBuildInputs+=" $1" - if [ -z "$crossConfig" ]; then + propagatedBuildInputs+=" $1" propagatedUserEnvPkgs+=" $1" - fi fi } -envHooks+=(_grantleeEnvHook) +if [ "$crossEnv" ]; then + crossEnvHooks+=(_grantleeEnvHook) +else + envHooks+=(_grantleeEnvHook) +fi |