From 5f308b50e4b4536406ab38a1f19de3d9a8681c17 Mon Sep 17 00:00:00 2001 From: Jude Taylor <me@jude.bio> Date: Sat, 11 Jul 2015 16:04:27 -0700 Subject: [PATCH] add system keychains to security-tool's propagated inputs --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- pkgs/os-specific/darwin/security-tool/default.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3586fd0a2324..232ea3630e4e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -214,9 +214,6 @@ self: super: { patchPhase = (drv.patchPhase or "") + '' substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security ''; - __propagatedImpureHostDeps = drv.__propagatedImpureHostDeps ++ [ - "/System/Library/Keychains" - ]; }) else super.x509-system; diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index 866d006238df..7cff4fc3eef4 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ GSS Kerberos Security PCSC Foundation ]; + __propagatedImpureHostDeps = [ "/System/Library/Keychains" ]; + buildInputs = [ gnustep-make libsecurity_asn1