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/kde-frameworks | |
| 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/kde-frameworks')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 2bf10737ab0b..08eebfd83aee 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -56,11 +56,7 @@ let # Propagate $dev so that this setup hook is propagated # But only if there is a separate $dev output if [ "$outputDev" != out ]; then - if [ -n "$crossConfig" ]; then - propagatedBuildInputs="$propagatedBuildInputs @dev@" - else - propagatedNativeBuildInputs="$propagatedNativeBuildInputs @dev@" - fi + propagatedBuildInputs="$propagatedBuildInputs @dev@" fi fi ''; |