Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files

stdenv setup: Always use both propagated files
2017-11-22 15:23:37 -05:00
parent 9ae72f2715 da19c34d0f
commit 405412dfd9
24 changed files with 83 additions and 133 deletions
--- 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
              '';