lol

fix filepaths for darwin.security_tool

+27 -19
+1 -1
pkgs/os-specific/darwin/apple-sdk/default.nix
··· 148 148 }; 149 149 150 150 overrides = super: { 151 - AppKit = stdenv.lib.overrideDerivation super.AppKit (drv: { 151 + CoreText = stdenv.lib.overrideDerivation super.CoreText (drv: { 152 152 propagatedNativeBuildInputs = drv.propagatedNativeBuildInputs ++ [ pkgs.darwin.cf-private ]; 153 153 }); 154 154
+1 -1
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
··· 19 19 for file in lib/castContext.h lib/gladmanContext.h lib/desContext.h lib/rc4Context.h; do 20 20 substituteInPlace ''$file --replace \ 21 21 '/usr/local/include/CommonCrypto/CommonCryptorSPI.h' \ 22 - '${osx_private_sdk}/usr/include/CommonCrypto/CommonCryptorSPI.h' 22 + '${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/CommonCrypto/CommonCryptorSPI.h' 23 23 done 24 24 25 25 substituteInPlace lib/opensshWrap.cpp --replace RSA_DSA_Keys.h RSA_DSA_keys.h
+1 -1
pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix
··· 6 6 libsecurity_cdsa_plugin 7 7 ]; 8 8 patchPhase = '' 9 - cp ${osx_private_sdk}/usr/local/include/sandbox_private.h . 9 + cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/sandbox_private.h . 10 10 substituteInPlace sandbox_private.h --replace '<sandbox.h>' '"${apple_sdk.sdk}/include/sandbox.h"' 11 11 substituteInPlace lib/AtomicFile.cpp --replace '<sandbox.h>' '"sandbox_private.h"' 12 12 '';
+1 -1
pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
··· 10 10 11 11 patchPhase = '' 12 12 # allows including <Security/some-private-header.h> 13 - ln -s ${pkgs.darwin.osx_private_sdk}/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders Security 13 + ln -s ${pkgs.darwin.osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders Security 14 14 15 15 grep -Rl MacErrors.h . | while read file; do 16 16 substituteInPlace "''$file" --replace \
+8 -8
pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
··· 15 15 ]; 16 16 patchPhase = '' 17 17 substituteInPlace lib/Keychains.cpp --replace DLDbListCFPref.h DLDBListCFPref.h 18 - 18 + 19 19 substituteInPlace lib/SecCertificate.cpp --replace '#include <Security/SecCertificatePriv.h>' "" 20 - 21 - cp ${osx_private_sdk}/usr/include/xpc/private.h xpc 20 + 21 + cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/xpc/private.h xpc 22 22 cp ${apple_sdk.sdk}/include/xpc/*.h xpc 23 - cp ${osx_private_sdk}/usr/local/include/sandbox_private.h lib/sandbox.h 24 - 23 + cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/sandbox_private.h lib/sandbox.h 24 + 25 25 substituteInPlace lib/SecItemPriv.h \ 26 26 --replace "extern CFTypeRef kSecAttrAccessGroup" "extern const CFTypeRef kSecAttrAccessGroup" \ 27 27 --replace "extern CFTypeRef kSecAttrIsSensitive" "extern const CFTypeRef kSecAttrIsSensitive" \ 28 28 --replace "extern CFTypeRef kSecAttrIsExtractable" "extern const CFTypeRef kSecAttrIsExtractable" 29 - 29 + 30 30 substituteInPlace lib/Keychains.cpp --replace \ 31 31 '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \ 32 32 '"${apple_sdk.sdk}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"' 33 - 33 + 34 34 substituteInPlace lib/CertificateValues.cpp --replace \ 35 35 '#include <Security/SecCertificatePriv.h>' "" 36 - 36 + 37 37 substituteInPlace lib/DLDBListCFPref.cpp --replace \ 38 38 'dispatch_once_t AppSandboxChecked;' ''$'namespace Security {\ndispatch_once_t AppSandboxChecked;' \ 39 39 --replace 'return mLoginDLDbIdentifier;' 'return mLoginDLDbIdentifier; }' \
+3 -3
pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
··· 14 14 substituteInPlace lib/debugging.cpp --replace PATH_MAX 1024 15 15 substituteInPlace lib/superblob.h --replace 'result->at' 'result->template at' 16 16 substituteInPlace lib/ccaudit.cpp --replace '<bsm/libbsm.h>' '"bsm/libbsm.h"' 17 - 18 - cp ${osx_private_sdk}/usr/include/security_utilities/utilities_dtrace.h lib 19 - cp -R ${osx_private_sdk}/usr/local/include/bsm lib 17 + 18 + cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/security_utilities/utilities_dtrace.h lib 19 + cp -R ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/bsm lib 20 20 '' + stdenv.lib.optionalString (!stdenv.cc.nativeLibc) '' 21 21 substituteInPlace lib/vproc++.cpp --replace /usr/local/include/vproc_priv.h ${stdenv.libc}/include/vproc_priv.h 22 22 '';
+9 -3
pkgs/os-specific/darwin/security-tool/default.nix
··· 1 - { CoreServices, Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk, fetchurl, gnustep-make, 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, libsecurity_keychain, libsecurity_mds, libsecurity_pkcs12, libsecurity_sd_cspdl, libsecurity_utilities, libsecurityd, osx_private_sdk, stdenv }: 1 + { CoreServices, Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk, 2 + fetchurl, gnustep-make, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl, 3 + libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp, 4 + libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, 5 + libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_cssm, libsecurity_filedb, 6 + libsecurity_keychain, libsecurity_mds, libsecurity_pkcs12, libsecurity_sd_cspdl, 7 + libsecurity_utilities, libsecurityd, osx_private_sdk, Security-framework, stdenv }: 2 8 3 9 stdenv.mkDerivation rec { 4 10 version = "55115"; ··· 11 17 12 18 patchPhase = '' 13 19 # copied from libsecurity_generic 14 - ln -s ${osx_private_sdk}/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders Security 20 + ln -s ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders Security 15 21 16 22 substituteInPlace cmsutil.c --replace \ 17 23 '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \ ··· 39 45 "security_INSTALL_DIR=\$(out)/bin" 40 46 ]; 41 47 42 - propagatedBuildInputs = [ GSS Kerberos Security PCSC Foundation ]; 48 + propagatedBuildInputs = [ GSS Kerberos Security-framework PCSC Foundation ]; 43 49 44 50 __propagatedImpureHostDeps = [ "/System/Library/Keychains" ]; 45 51
+3 -1
pkgs/top-level/all-packages.nix
··· 9527 9527 osx_sdk = callPackage ../os-specific/darwin/osx-sdk {}; 9528 9528 osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {}; 9529 9529 9530 - security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool { }; 9530 + security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool { 9531 + Security-framework = darwin.apple_sdk.frameworks.Security; 9532 + }; 9531 9533 9532 9534 binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; }; 9533 9535