diff options
Diffstat (limited to 'pkgs/os-specific/darwin')
45 files changed, 60 insertions, 55 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index a62182f1d347..c23a2148143a 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -71,6 +71,8 @@ let # because we copy files from the system preferLocalBuild = true; + disallowedRequisites = [ sdk ]; + installPhase = '' linkFramework() { local path="$1" @@ -160,8 +162,8 @@ in rec { installPhase = '' mkdir -p $out/include pushd $out/include >/dev/null - ln -s "${lib.getDev sdk}/include/xpc" - ln -s "${lib.getDev sdk}/include/launch.h" + cp -r "${lib.getDev sdk}/include/xpc" $out/include/xpc + cp "${lib.getDev sdk}/include/launch.h" $out/include/launch.h popd >/dev/null ''; }; diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index f8c424089f09..9e47b8d02fdf 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -86,7 +86,6 @@ with frameworks; with libs; { QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ]; QuickLook = [ ApplicationServices CF ]; QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ]; - Ruby = []; SceneKit = []; ScreenSaver = []; Scripting = []; diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index 6cf7ee07b70b..89ff68266a29 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cctools, appleDerivation }: +{ cctools, appleDerivation }: appleDerivation { nativeBuildInputs = [ cctools ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix index 302a657992aa..29aa3d64cb08 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, ed, unifdef }: +{ appleDerivation, ed, unifdef }: appleDerivation { nativeBuildInputs = [ ed unifdef ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index d73dc8f3ec24..542ea20de11e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }: +{ appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }: appleDerivation { nativeBuildInputs = [ ed unifdef ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix index d3ffa1fa2834..add51a61d3d3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix index 1a01d0321918..df5f6b7b8fd6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix index de691a056f3e..2ee80d702646 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 386480d62902..1e27ead69f1b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,6 +1,6 @@ -{ stdenv, appleDerivation, cpio, bootstrap_cmds, xnu, Libc, Libm, libdispatch, cctools, Libinfo, +{ stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo, dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile, - removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: + removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil }: appleDerivation rec { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix index f09842630fdb..e04142b8b11e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index 35608587c569..318e2728fc2e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchzip, version, bsdmake, perl, flex, yacc, writeScriptBin +{ stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc }: # this derivation sucks diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index fda7cd85e4f7..7b1492799ddb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, libutil-new }: +{ stdenv, appleDerivation, xcbuild, ncurses, libutil-new }: appleDerivation { # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 596ca25d70a4..5d9781f3aa4a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, xcbuildHook }: +{ stdenv, appleDerivation, xcbuildHook }: appleDerivation rec { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix index baa3b11225d0..043c7b0bc70d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }: +{ stdenv, appleDerivation, makeWrapper }: appleDerivation { nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix index 37dffaa9b20e..7e1dc5309b1d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index a572d46ceab5..4220c50d61cb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, appleDerivation, xcbuildHook }: +{ stdenv, appleDerivation, xcbuildHook }: appleDerivation rec { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index b947267ab14d..f27b5ae13022 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -1,5 +1,5 @@ { stdenv, appleDerivation, xcbuildHook -, lib, hostPlatform, Libc, xnu, libutil-new }: +, Libc, xnu, libutil-new }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix index 5fcd04266d5a..fd2c95563b48 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, cctools, zlib }: +{ appleDerivation, cctools, zlib }: appleDerivation { buildInputs = [ cctools zlib ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix index 80d629dfa3e6..b24d94b9d70d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix index 86bc6e598f7d..eed7982e9d8c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { # No clue why the same file has two different names. Ask Apple! diff --git a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix index 826dbed1dfe0..ac33a24a8b4e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index a43c00f7691b..46e9e592ddc6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontConfigure = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 369556fd5a1c..3d62c3961221 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, lib, autoreconfHook, targetPlatform +{ stdenv, appleDerivation, lib, targetPlatform , enableStatic ? targetPlatform.isiOS , enableShared ? !targetPlatform.isiOS }: @@ -10,8 +10,10 @@ appleDerivation { sed -i 's/darwin\*/ios\*/g' configure libcharset/configure ''; - configureFlags = lib.optional enableStatic "--enable-static" - ++ lib.optional (!enableShared) "--disable-shared"; + configureFlags = [ + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + ]; postInstall = lib.optionalString (!enableStatic) '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix index 41b1bf74af9e..4fd0ab8a7fb2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix index 5a2cd33d8a03..f3c7558cfc62 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, Libinfo, configd, mDNSResponder }: +{ appleDerivation, Libinfo, configd, mDNSResponder }: appleDerivation { buildInputs = [ Libinfo configd mDNSResponder ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix index aa73c281cab2..e5637d6db410 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix @@ -1,4 +1,4 @@ -{ Security, appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }: +{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }: appleDerivation { buildInputs = [ libsecurity_utilities diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix index 053dea134c72..cf9fe411533f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_codesigning, libsecurity_utilities, perl }: +{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, perl }: appleDerivation { buildInputs = [ libsecurity_utilities 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 6730e2424be4..7986706cb647 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 @@ -26,8 +26,9 @@ name: version: sha256: args: let ''; preBuild = '' ln -s lib ${n} - makeFlagsArray=(-j''$NIX_BUILD_CORES) + makeFlagsArray=(-j$NIX_BUILD_CORES) ''; + outputs = [ "out" "dev" ]; buildInputs = [ pkgs.gnustep.make pkgs.darwin.apple_sdk.frameworks.AppKit @@ -51,6 +52,7 @@ name: version: sha256: args: let "-iframework ${pkgs.darwin.Security}/Library/Frameworks" "-I." "-Wno-deprecated-declarations" + "-DNDEBUG" ]; NIX_LDFLAGS = with pkgs.darwin; with apple_sdk.frameworks; [ "-L${libobjc}/lib" diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix index 07a3186caeec..609d07fda100 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix @@ -1,4 +1,4 @@ -{ CF, Security, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }: +{ CF, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }: appleDerivation { buildInputs = [ libsecurity_utilities diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix index e811c4c11a82..1ab950a9233c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix @@ -1,4 +1,4 @@ -{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, sqlite, stdenv, osx_private_sdk }: +{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, sqlite, stdenv, osx_private_sdk }: appleDerivation { buildInputs = [ libauto diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix index 48bb80eb7511..fb3441f70507 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix @@ -9,7 +9,7 @@ appleDerivation { unpackFile ${libsecurity_cdsa_client.src} mv libsecurity_cdsa_client*/lib security_cdsa_client ln -s lib securityd_client - + patch -p1 < ${./xdr-arity.patch} ''; preBuild = '' @@ -17,7 +17,7 @@ appleDerivation { cp derived_src/* lib rm lib/ucspClientC.c ''; - postInstall = '' - ln -s ''$out/include/securityd ''$out/include/securityd_client + postFixup = '' + ln -s $dev/include/securityd $dev/include/securityd_client ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix index 63674808d93b..f17ed785360d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix index cea5fc9a4e2c..5c78182085b5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix index 17c24bebfda7..5668c376130e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix index 8baf62dba01b..2b45fbdb45e2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation }: +{ appleDerivation }: appleDerivation { installPhase = '' diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index 1bbda6ab7add..39c903a2e7b9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, xcbuild, lib, hostPlatform +{ stdenv, appleDerivation, lib , Librpcsvc, apple_sdk, pam, CF, openbsm }: appleDerivation rec { diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index 08df235ed8c2..91abb3ca07a8 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchurl, xcbuildHook, ncurses, bzip2, zlib, lzma }: +{ stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 2c7da5be6e4c..74c9f2543481 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, fetchzip, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }: +{ appleDerivation, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }: appleDerivation { phases = [ "unpackPhase" "patchPhase" "installPhase" ]; diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 21d64979d7ea..bd10dde5572c 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -1,5 +1,4 @@ { stdenv, binutils-unwrapped, cctools -, hostPlatform, targetPlatform }: # Make sure both underlying packages claim to have prepended their binaries diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 0c908197acb8..995e9af38cb8 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook -, libcxx, libcxxabi, libuuid +{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook +, libcxxabi, libuuid , libobjc ? null, maloader ? null , hostPlatform, targetPlatform , enableDumpNormalizedLibArgs ? false diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix index c1e29843147c..6ed3b28eccc3 100644 --- a/pkgs/os-specific/darwin/darling/default.nix +++ b/pkgs/os-specific/darwin/darling/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchzip, cmake, bison, flex}: +{stdenv, lib, fetchzip}: stdenv.mkDerivation rec { pname = "darling"; diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index e6846aef7507..f161a7a88e17 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -1,4 +1,4 @@ -{ CoreServices, Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk, +{ Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk, 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, @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0apcz4vy2z5645jhrs60wj3w27mncjjqv42h5lln36g6qs2n9113"; }; + disallowedRequisites = [ apple_sdk.sdk ]; + patchPhase = '' # copied from libsecurity_generic cp -R ${osx_private_sdk}/include/SecurityPrivateHeaders Security @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { ''; preBuild = '' - makeFlagsArray=(-j''$NIX_BUILD_CORES) + makeFlagsArray=(-j$NIX_BUILD_CORES) ''; NIX_LDFLAGS = "-no_dtrace_dof"; @@ -97,4 +99,3 @@ stdenv.mkDerivation rec { license = licenses.apsl20; }; } - diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix index fdc97304528d..dd652dc56273 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/default.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/default.nix @@ -1,4 +1,4 @@ -{callPackage, stdenv, darwin, xcbuild}: +{callPackage, darwin}: rec { corefoundation = callPackage ./corefoundation.nix {}; diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index 4104d0d455ad..7f327fcf3d7a 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, frameworks, perl } : stdenv.mkDerivation rec { - version = "0.9.0"; + version = "0.9.1"; name = "trash-${version}"; src = fetchFromGitHub { owner = "ali-rantakari"; repo = "trash"; - rev = "f68ad25a02e24cc58eb8ef9a493d6dc0122bcd8f"; + rev = "v${version}"; sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41"; }; diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index d5ed21cd9e24..b848265736e6 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -1,4 +1,4 @@ -{ lib, hostPlatform, targetPlatform +{ targetPlatform , clang-unwrapped , binutils-unwrapped , runCommand |