From 0ec2ba9497c53ff04474f94df168d7c8cad8faa4 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 20 Aug 2016 13:30:01 +0200 Subject: [PATCH 1/2] darwin.libsecurity: fix for gnustep makefiles --- .../apple-source-releases/libsecurity_generic/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index ccce7448e5db..ef449a7d415d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -29,7 +29,7 @@ name: version: sha256: args: let makeFlagsArray=(-j''$NIX_BUILD_CORES) ''; buildInputs = [ - pkgs.gnustep-make + pkgs.gnustep.make pkgs.darwin.apple_sdk.frameworks.AppKit pkgs.darwin.apple_sdk.frameworks.Foundation pkgs.darwin.cf-private @@ -38,6 +38,7 @@ name: version: sha256: args: let "-f${makeFile}" "MAKEFILE_NAME=${makeFile}" "GNUSTEP_ABSOLUTE_INSTALL_PATHS=yes" + "GNUSTEP_MAKEFILES=${pkgs.gnustep.make}/share/GNUstep/Makefiles" "LIB_LINK_INSTALL_DIR=\$(out)/lib" ]; installFlags = [ From a9e913ffbf9aa7e9efa5326e02eb5fb447528366 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 20 Aug 2016 13:43:58 +0200 Subject: [PATCH 2/2] darwin.security_tool: fix for gnustep makefiles --- pkgs/os-specific/darwin/security-tool/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index f0877aa3404e..6944d2b8b437 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -1,5 +1,5 @@ { CoreServices, Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk, -fetchurl, gnustep-make, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl, +fetchurl, gnustep, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl, libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_cssm, libsecurity_filedb, @@ -39,7 +39,11 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-no_dtrace_dof"; - makeFlags = "-f ${./GNUmakefile} MAKEFILE_NAME=${./GNUmakefile}"; + makeFlags = [ + "-f ${./GNUmakefile}" + "MAKEFILE_NAME=${./GNUmakefile}" + "GNUSTEP_MAKEFILES=${gnustep.make}/share/GNUstep/Makefiles" + ]; installFlags = [ "security_INSTALL_DIR=\$(out)/bin" @@ -50,7 +54,7 @@ stdenv.mkDerivation rec { __propagatedImpureHostDeps = [ "/System/Library/Keychains" ]; buildInputs = [ - gnustep-make + gnustep.make libsecurity_asn1 libsecurity_utilities libsecurity_cdsa_utilities