JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17864 from LnL7/darwin-libsecurity

Browse Source 
darwin.libsecurity: fix for gnustep makefiles
This commit is contained in:
Daiderd Jordan 2016-08-24 19:56:24 +02:00 committed by GitHub
commit 8b8a74d5d6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
View File

@ -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 = [

10
pkgs/os-specific/darwin/security-tool/default.nix
View File

@ -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