Merge remote-tracking branch 'upstream/staging' into HEAD

2018-01-02 19:10:45 +01:00
parent 63c1a54257 4cc2a38854
commit 804285f589
408 changed files with 3419 additions and 2498 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