Merge pull request #26805 from obsidiansystems/cross-elegant

Make cross compilation elegant
2017-12-30 22:58:02 -05:00
parent 553fd19e67 a98e68676d
commit 4d2b763817
88 changed files with 1059 additions and 699 deletions
@@ -222,8 +222,8 @@ stdenv.mkDerivation ({
    setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
    configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"

-    # nativePkgs defined in stdenv/setup.hs
-    for p in "''${nativePkgs[@]}"; do
+    # host.*Pkgs defined in stdenv/setup.hs
+    for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
      if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
        cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/
        continue