about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-10-02 15:18:39 -0500
committerGitHub <noreply@github.com>2018-10-02 15:18:39 -0500
commita88b8da55436e4d74ff5fa50c5c20308966a34cb (patch)
tree693486aba900cfcc2957931c8a34318b28e6dce2 /pkgs/development/haskell-modules
parent1643967b8dc3d0d618a9ebc960996bf807dbbf4c (diff)
parent300ff965ae3e45548f62bc300059dbecb4a93e7b (diff)
downloadnixlib-a88b8da55436e4d74ff5fa50c5c20308966a34cb.tar
nixlib-a88b8da55436e4d74ff5fa50c5c20308966a34cb.tar.gz
nixlib-a88b8da55436e4d74ff5fa50c5c20308966a34cb.tar.bz2
nixlib-a88b8da55436e4d74ff5fa50c5c20308966a34cb.tar.lz
nixlib-a88b8da55436e4d74ff5fa50c5c20308966a34cb.tar.xz
nixlib-a88b8da55436e4d74ff5fa50c5c20308966a34cb.tar.zst
nixlib-a88b8da55436e4d74ff5fa50c5c20308966a34cb.zip
Merge pull request #47676 from matthewbauer/security-mojave-fix
haskell: fix x509-system on mojave
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 43ba2d000eb5..bb9b0e5d5fe6 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -131,8 +131,16 @@ self: super: builtins.intersectAttrs super {
   x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
     then let inherit (pkgs.darwin) security_tool;
       in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
+        # darwin.security_tool is broken in Mojave (#45042)
+
+        # We will use the system provided security for now.
+        # Beware this WILL break in sandboxes!
+
+        # TODO(matthewbauer): If someone really needs this to work in sandboxes,
+        # I think we can add a propagatedImpureHost dep here, but I’m hoping to
+        # get a proper fix available soonish.
         postPatch = (drv.postPatch or "") + ''
-          substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
+          substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
         '';
       })
     else super.x509-system;