Try #480:

input-output-hk · Mar 10, 2020 · accd298 · accd298
2 parents 0448544 + 23fa182
commit accd298
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/builder/comp-builder.nix b/builder/comp-builder.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, ghc, lib, pkgconfig, gobject-introspection ? null, haskellLib, makeConfigFiles, ghcForComponent, hsPkgs, runCommand, libffi, gmp }:
+{ stdenv, buildPackages, ghc, lib, gobject-introspection ? null, haskellLib, makeConfigFiles, ghcForComponent, hsPkgs, runCommand, libffi, gmp }:
 
 { componentId
 , component
@@ -121,7 +121,7 @@ let
     (lib.concatMap (c: if c.isHaskell or false
       then builtins.attrValues (c.components.exes or {})
       else [c]) component.build-tools) ++
-    lib.optional (component.pkgconfig != []) pkgconfig;
+    lib.optional (component.pkgconfig != []) buildPackages.pkgconfig;
 
   # Unfortunately, we need to wrap ghc commands for cabal builds to
   # work in the nix-shell. See ../doc/removing-with-package-wrapper.md.

diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix
@@ -106,6 +106,7 @@ in {
                 ++ self.lib.optional (version == "8.6.3") ./patches/ghc/ghc-8.6.3-reinstallable-lib-ghc.patch
                 ++ self.lib.optional (version == "8.6.4") ./patches/ghc/ghc-8.6.4-reinstallable-lib-ghc.patch
                 ++ self.lib.optional (version == "8.6.5") ./patches/ghc/ghc-8.6.5-reinstallable-lib-ghc.patch
+                ++ self.lib.optional (version == "8.6.5") ./patches/ghc/ghc-8.6.5-atomic-arm-arch.patch
                 ++ self.lib.optional (version == "8.8.1") ./patches/ghc/ghc-8.8.1-reinstallable-lib-ghc.patch
                 ++ self.lib.optional (version == "8.8.2") ./patches/ghc/ghc-8.8.2-reinstallable-lib-ghc.patch
                 ++ self.lib.optional (version == "8.6.4") ./patches/ghc/ghc-8.6.4-better-plusSimplCountErrors.patch

diff --git a/overlays/patches/ghc/ghc-8.6.5-atomic-arm-arch.patch b/overlays/patches/ghc/ghc-8.6.5-atomic-arm-arch.patch
@@ -0,0 +1,12 @@
+diff --git a/libraries/ghc-prim/cbits/atomic.c b/libraries/ghc-prim/cbits/atomic.c
+index ea96120..f3f4a9e 100644
+--- a/libraries/ghc-prim/cbits/atomic.c
++++ b/libraries/ghc-prim/cbits/atomic.c
+@@ -1,6 +1,6 @@
+-#if !defined(arm_HOST_ARCH)
+ #include "Rts.h"
+
++#if !defined(arm_HOST_ARCH)
+ // Fallbacks for atomic primops on byte arrays. The builtins used
+ // below are supported on both GCC and LLVM.
+ //