From c7ab795274fab9206de81f4ad81bc544d2c9fd1b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 4 Jul 2018 15:08:35 -0400 Subject: darwin.security_tool: disallow requiring sdk As requested by @domenkozar --- pkgs/os-specific/darwin/apple-sdk/default.nix | 2 ++ pkgs/os-specific/darwin/security-tool/default.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index d4a48b9c372..c23a2148143 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -71,6 +71,8 @@ let # because we copy files from the system preferLocalBuild = true; + disallowedRequisites = [ sdk ]; + installPhase = '' linkFramework() { local path="$1" diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index ff35c292890..4566d82835f 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0apcz4vy2z5645jhrs60wj3w27mncjjqv42h5lln36g6qs2n9113"; }; + disallowedRequisites = [ apple_sdk.sdk ]; + patchPhase = '' # copied from libsecurity_generic cp -R ${osx_private_sdk}/include/SecurityPrivateHeaders Security @@ -97,4 +99,3 @@ stdenv.mkDerivation rec { license = licenses.apsl20; }; } - -- cgit 1.4.1