From 695136db1c2af6103400b4f76522da36745247d5 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Tue, 17 Feb 2015 16:58:42 -0800 Subject: [PATCH] Temporarily fix build of x509-system on Darwin. Introduces a nasty impurity but what can you do :( --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index eeee4998c31d..6d02f4c6cb96 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -144,9 +144,11 @@ self: super: { # Prevents needing to add security_tool as a build tool to all of x509-system's # dependencies. - x509-system = overrideCabal super.x509-system (drv: { + # TODO: use pkgs.darwin.security_tool once we can build it + x509-system = let security_tool = "/usr"; + in overrideCabal super.x509-system (drv: { patchPhase = (drv.patchPhase or "") + pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin '' - substituteInPlace System/X509/MacOS.hs --replace security ${pkgs.darwin.security_tool}/bin/security + substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security ''; });