alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #27245 from NixOS/osx_private_sdk/cleanup

Browse source 
Get rid of some usages of osx_private_sdk
This commit is contained in:
Domen Kožar 2017-07-09 22:49:31 +02:00 committed by GitHub
parent a37f3a3573 e211504db6
commit ca76954e49
11 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
View file

@ -1,4 +1,4 @@
{ appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_utilities, osx_private_sdk, stdenv }:
{ appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_utilities, CommonCrypto, stdenv }:
appleDerivation {
buildInputs = [
libsecurity_cdsa_utilities
@ -19,7 +19,7 @@ appleDerivation {
for file in lib/castContext.h lib/gladmanContext.h lib/desContext.h lib/rc4Context.h; do
substituteInPlace ''$file --replace \
'/usr/local/include/CommonCrypto/CommonCryptorSPI.h' \
'${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/CommonCrypto/CommonCryptorSPI.h'
'${CommonCrypto}/include/CommonCrypto/CommonCryptorSPI.h'
done
substituteInPlace lib/opensshWrap.cpp --replace RSA_DSA_Keys.h RSA_DSA_keys.h

2
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix
View file

@ -1,4 +1,4 @@
{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd, osx_private_sdk }:
{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd }:
appleDerivation {
buildInputs = [
libsecurity_cdsa_plugin

2
pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix
View file

@ -1,4 +1,4 @@
{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities }:
appleDerivation {
__propagatedImpureHostDeps = [
"/System/Library/Frameworks/Security.framework/Security"

4
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix
View file

@ -1,4 +1,4 @@
{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_cssm, libsecurity_utilities, osx_private_sdk, perl }:
{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_cssm, libsecurity_utilities, perl }:
appleDerivation {
buildInputs = [
libsecurity_cdsa_utilities
@ -12,4 +12,4 @@ appleDerivation {
preBuild = ''
perl lib/generator.pl lib lib/generator.cfg lib lib || exit 1
'';
}
}

2
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix
View file

@ -1,4 +1,4 @@
{ CommonCrypto, appleDerivation, libsecurity_codesigning, libsecurity_utilities, m4, osx_private_sdk }:
{ CommonCrypto, appleDerivation, libsecurity_codesigning, libsecurity_utilities, m4 }:
appleDerivation {
buildInputs = [
libsecurity_utilities

2
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
View file

@ -1,4 +1,4 @@
{ Security, appleDerivation, apple_sdk, cppcheck, libsecurity_cdsa_utilities, libsecurity_utilities, m4, osx_private_sdk }:
{ Security, appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }:
appleDerivation {
buildInputs = [
libsecurity_utilities

2
pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix
View file

@ -1,4 +1,4 @@
{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_utilities, libsecurity_utilities }:
appleDerivation {
buildInputs = [
libsecurity_utilities

2
pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix
View file

@ -1,4 +1,4 @@
{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utils, libsecurity_keychain, osx_private_sdk }:
{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utils, libsecurity_keychain }:
appleDerivation {
patchPhase = ''
substituteInPlace lib/pkcsoids.h --replace '#error' '#warning'

4
pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
View file

@ -1,4 +1,4 @@
{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, osx_private_sdk, sqlite, stdenv }:
{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, sqlite, stdenv, osx_private_sdk }:
appleDerivation {
buildInputs = [
libauto
@ -16,7 +16,7 @@ appleDerivation {
substituteInPlace lib/ccaudit.cpp --replace '<bsm/libbsm.h>' '"bsm/libbsm.h"'
substituteInPlace lib/powerwatch.h --replace \
'<IOKit/pwr_mgt/IOPMLibPrivate.h>' \
'"${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/PrivateHeaders/pwr_mgt/IOPMLibPrivate.h"'
'"${IOKit}/Library/Frameworks/IOKit.framework/Headers/pwr_mgt/IOPMLibPrivate.h"'
cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/security_utilities/utilities_dtrace.h lib
cp -R ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/bsm lib

4
pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix
View file

@ -1,4 +1,4 @@
{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }:
{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_utilities }:
appleDerivation {
buildInputs = [
libsecurity_cdsa_utilities
@ -20,4 +20,4 @@ appleDerivation {
postInstall = ''
ln -s ''$out/include/securityd ''$out/include/securityd_client
'';
}
}

2
pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, appleDerivation, dyld, osx_private_sdk }:
{ stdenv, appleDerivation }:
appleDerivation {
buildPhase = ":";