pyrox.dev
Merge pull request #17864 from LnL7/darwin-libsecurity
darwin.libsecurity: fix for gnustep makefiles
authored by
Daiderd Jordan
and committed by
GitHub
8b8a74d5
e208e698
+2
-1
pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
+2
-1
pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
···
29
29
makeFlagsArray=(-j''$NIX_BUILD_CORES)
30
30
'';
31
31
buildInputs = [
32
-
pkgs.gnustep-make
32
+
pkgs.gnustep.make
33
33
pkgs.darwin.apple_sdk.frameworks.AppKit
34
34
pkgs.darwin.apple_sdk.frameworks.Foundation
35
35
pkgs.darwin.cf-private
···
38
38
"-f${makeFile}"
39
39
"MAKEFILE_NAME=${makeFile}"
40
40
"GNUSTEP_ABSOLUTE_INSTALL_PATHS=yes"
41
+
"GNUSTEP_MAKEFILES=${pkgs.gnustep.make}/share/GNUstep/Makefiles"
41
42
"LIB_LINK_INSTALL_DIR=\$(out)/lib"
42
43
];
43
44
installFlags = [
+7
-3
pkgs/os-specific/darwin/security-tool/default.nix
+7
-3
pkgs/os-specific/darwin/security-tool/default.nix
···
1
1
{ CoreServices, Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk,
2
-
fetchurl, gnustep-make, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl,
2
+
fetchurl, gnustep, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl,
3
3
libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp,
4
4
libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin,
5
5
libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_cssm, libsecurity_filedb,
···
39
39
40
40
NIX_LDFLAGS = "-no_dtrace_dof";
41
41
42
-
makeFlags = "-f ${./GNUmakefile} MAKEFILE_NAME=${./GNUmakefile}";
42
+
makeFlags = [
43
+
"-f ${./GNUmakefile}"
44
+
"MAKEFILE_NAME=${./GNUmakefile}"
45
+
"GNUSTEP_MAKEFILES=${gnustep.make}/share/GNUstep/Makefiles"
46
+
];
43
47
44
48
installFlags = [
45
49
"security_INSTALL_DIR=\$(out)/bin"
···
50
54
__propagatedImpureHostDeps = [ "/System/Library/Keychains" ];
51
55
52
56
buildInputs = [
53
-
gnustep-make
57
+
gnustep.make
54
58
libsecurity_asn1
55
59
libsecurity_utilities
56
60
libsecurity_cdsa_utilities