Commit graph

46 commits

Author SHA1 Message Date
Weijia Wang 588f16c917 darwin.apple_sdk_11_0: deprecate clang*Stdenv 2023-05-29 01:50:46 +03:00
Weijia Wang 3d29de1f5b darwin.apple_sdk_11_0: add mkCc 2023-05-24 16:49:40 +03:00
Randy Eckenrode 2c070763c7
rustPlatform.bindgenHook: use the correct Libsystem on the 11.0 SDK 2023-05-24 08:08:30 -04:00
Weijia Wang bd7c4e7b36 clang16Stdenv: init 2023-05-11 14:17:40 +03:00
netfox 815d6c0d3e
apple-framework-System: fix System.tbd dangling symbolic link
Contrarily to the other frameworks, System framework's TBD file
is a symlink pointing to `${MacOSX-SDK}/usr/lib/libSystem.B.tbd`.

This produces an error when using the framework, as:

  1. The original file is not copied into the output directory
  2. Even if it was copied, the relative path wouldn't match

Resulting in the symlink being broken and the linker failing when
trying to link `-framework System`.

The fix applied consists in replacing the symbolic link with the
actual file, as this is easier than fixing the link and doesn't
seem to produce any side effects.
2023-04-12 14:37:48 +02:00
Stéphan Kochen a0537d633f apple_sdk_11_0: simplify SDK unpacking
The SDK was missing SDKSettings files. This is usually not a problem for
Nix builds, because we generate our own fake SDK structure when
necessary (in xcbuild), but not having these files blocks using the
upstream Apple SDK in tooling such as gen-frameworks.py.
2023-03-17 21:30:51 +01:00
Stéphan Kochen 0c3aaf3e6c apple_sdk_11_0: fix circular framework references 2023-03-17 21:30:51 +01:00
Stéphan Kochen b9e6d1dbc0 apple_sdk_11_0: generate frameworks.nix 2023-03-17 21:30:51 +01:00
Malo Bourgon 7a734f2795 darwin.apple_sdk_11_0: code cleanup 2023-03-04 12:38:03 +11:00
Malo Bourgon 68648fa4c0 darwin.apple_sdk_11_0.clang{12-15}Stdenv: init 2023-03-04 12:34:48 +11:00
Weijia Wang ab368e702d darwin.apple_sdk_11_0.rustPlatform: init 2023-02-02 17:45:13 -05:00
Stéphan Kochen f4ae6b252d Revert "darwin.apple_sdk_11_0: add Security dependency on xpc"
This reverts commit 511f21df7c.

In apple_sdk_11_0, the xpc package contains only headers that are
already part of libsystem, so this change did nothing.

For Swift and `-fmodules`, this actually caused an error, because
there was now a duplicate module in the search path.
2023-01-22 10:36:10 +01:00
Sergei Trofimovich b9b1d958d0 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/libraries/qt-6/modules/qtbase.nix
	pkgs/stdenv/linux/make-bootstrap-tools.nix
2023-01-20 21:56:57 +00:00
Weijia Wang 846e4de6e8 darwin.apple_sdk_11_0.libpm: init 2023-01-18 14:58:43 +01:00
toonn b7590f3429
Merge pull request #189977 from stephank/feat/swift-darwin
swift: split build & Darwin support.
2023-01-17 14:51:00 +01:00
Nick Cao 519ef86421
Merge pull request #209260 from azuwis/sketchybar
sketchybar: 2.8.2 -> 2.12.3
2023-01-17 10:42:09 +08:00
github-actions[bot] 96d361c622
Merge staging-next into staging 2023-01-13 12:02:02 +00:00
K900 2b06f2a986 darwin/apple-sdk-11.0: expose xcodebuild directly 2023-01-12 10:36:42 +03:00
Uri Baghin ea9c9ba75c
Merge pull request #207123 from divanorama/darwin_security_xpc
darwin.apple_sdk_11_0: add Security dependency on xpc
2023-01-12 08:37:53 +11:00
luxus c40708f924 darwin.apple_sdk.frameworks.DisplayServices: init
Used by sketchybar
2023-01-10 23:14:00 +08:00
Weijia Wang ac3c81faa1 darwin.apple_sdk: expose MultitouchSupport 2023-01-03 18:23:33 +01:00
Weijia Wang 198d522594 darwin.apple_sdk.frameworks.DebugSymbols: init 2023-01-02 23:05:36 -05:00
Dmitry Ivankov 511f21df7c darwin.apple_sdk_11_0: add Security dependency on xpc
Some packages like `bazel-watcher` seems to have broken after
9dc3b14859

Where `xpc` was removed from `IOSurface` dependencies.
`CoreServices` were pulling `xpc` via `IOSurface` and so `Security`
didn't break. Now explicit dependency on `xpc` is needed to avoid
errors like
```
In file included from __main__/external/com_github_fsnotify_fsevents/go_1_10_after.go:6:
In file included from /nix/store/2k3mdkl9jvwwzpbfaqhchfiqjq64046b-apple-framework-CoreServices-11.0.0/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h:39:
In file included from /nix/store/2k3mdkl9jvwwzpbfaqhchfiqjq64046b-apple-framework-CoreServices-11.0.0/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Headers/LaunchServices.h:23:
In file included from /nix/store/2k3mdkl9jvwwzpbfaqhchfiqjq64046b-apple-framework-CoreServices-11.0.0/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Headers/IconsCore.h:23:
In file included from /nix/store/2k3mdkl9jvwwzpbfaqhchfiqjq64046b-apple-framework-CoreServices-11.0.0/Library/Frameworks/CoreServices.framework/Frameworks/OSServices.framework/Headers/OSServices.h:29:
In file included from /nix/store/2k3mdkl9jvwwzpbfaqhchfiqjq64046b-apple-framework-CoreServices-11.0.0/Library/Frameworks/CoreServices.framework/Frameworks/OSServices.framework/Headers/CSIdentity.h:43:
In file included from /nix/store/dg51rm1bapffbqvn46bh43km4dhcsy9p-apple-framework-Security-11.0.0/Library/Frameworks/Security.framework/Headers/Security.h:87:
/nix/store/dg51rm1bapffbqvn46bh43km4dhcsy9p-apple-framework-Security-11.0.0/Library/Frameworks/Security.framework/Headers/SecCode.h:35:10: fatal error: 'xpc/xpc.h' file not found
         ^~~~~~~~~~~
```

Should help with https://github.com/NixOS/nixpkgs/pull/203519
2022-12-21 17:05:16 +01:00
Stéphan Kochen 8ed924c07a swift: compiler only build & darwin support 2022-10-10 21:26:47 +02:00
Stéphan Kochen 6062fd0800 apple_sdk_11_0: Add SwiftUI dependencies 2022-10-10 21:25:44 +02:00
Stéphan Kochen e23a97700f apple_sdk_11_0: Fix missing CoreVideo include 2022-10-10 21:25:43 +02:00
Stéphan Kochen 6a20451ac0 apple_sdk_11_0: Foundation depends on Combine 2022-10-10 21:25:43 +02:00
Stéphan Kochen d69453559a apple_sdk_11_0: install swift modules 2022-10-10 21:25:43 +02:00
Theodore Ni ac6d052fd9
apple_sdk: clean up unused Libsystem parameter 2022-09-20 12:14:51 +02:00
Stéphan Kochen 9dc3b14859
IOSurface: remove xpc dependency 2022-09-20 12:14:50 +02:00
Stéphan Kochen 6515b56871
darwin.apple_sdk_11_0: use stdenv objc4
Stdenv on aarch64-darwin pulls in (bootstrap-stage4) objc4, unlike
x86_64. However derivations that otherwise depend on objc4 would use a
a different objc4 derivation on top of the final stdenv.

Because this library defines an LLVM module, having multiple instances
of it in the import path will interfere with builds.
2022-09-20 12:14:49 +02:00
Stéphan Kochen a7eb0a180b darwin.Libsystem: add missing modulemaps 2022-08-12 11:54:10 +02:00
Randy Eckenrode 9659c7abce
apple_sdk_11_0: provide SDK-specific callPackage 2022-07-07 07:52:36 -04:00
Randy Eckenrode 4741402d54
apple_sdk_11_0: expose 11.0 sdk stdenv as an attribute 2022-07-06 19:41:17 -04:00
Randy Eckenrode d8f71776ff
apple_sdk_11_0: fix build on x86_64-darwin and expose as attribute 2022-07-06 19:41:17 -04:00
Malo Bourgon 62860b31ef Revert "darwin.apple_sdk.frameworks.IOSurface: use Libsystem instead of xpc (#161561)"
This reverts commit 92074a45f3.
2022-03-04 21:07:35 -05:00
Finn Behrens 92074a45f3
darwin.apple_sdk.frameworks.IOSurface: use Libsystem instead of xpc (#161561) 2022-02-23 15:57:01 -05:00
Angus Trau 6395aaba17 darwin.apple_sdk.frameworks.AVFoundation: Add missing dependencies 2021-08-01 12:51:26 +10:00
Luke Granger-Brown a7be563707 darwin.apple_sdk.frameworks.CoreSymbolication: expose under SDK 11.0
This is used by the `root` package, and otherwise prevents the
nixpkgs.tarball build from succeeding (e.g.
https://hydra.nixos.org/build/146838433).
2021-07-05 02:09:35 +00:00
Jonathan Ringer 430ac9b830 apple_sdk_11: alias JavaVM
Apple removed JavaVM but JavaNativeFoundation seems to be
the replacement. Should be safe to substitute usage of
JavaVM with JavaNativeFoundation.
2021-06-06 15:09:41 -07:00
Domen Kožar aeb44a891a
Merge pull request #125184 from domenkozar/aarch64-darwin-eval
Aarch64 darwin eval
2021-06-03 11:21:20 +02:00
Domen Kožar 9e6417f2a4
fix tarball job evaluation for aarch64-darwin 2021-06-03 10:52:46 +02:00
Anbang Wen 2565e3bba6 nixos/apple-sdk: 11.0 -> 11.1
The previous URL is a dead link. This commit updates it and bump the
SDK version to 11.1.
2021-06-02 09:23:28 -07:00
Ivan Babrou 68733c16f5 darwin.apple_sdk.frameworks: add missing dependencies
```
/nix/store/5mgn511gbldf7xl5kjm27z9lj10xcycl-apple-framework-CoreData-11.0.0/Library/Frameworks/CoreData.framework/Headers/NSPersistentCloudKitContainerOptions.h:10:9: fatal error: 'CloudKit/CKDatabase.h' file not found
        ^~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
```

```
/nix/store/a7k7kqj08602785vsrss0xa85b08hik4-apple-framework-CloudKit-11.0.0/Library/Frameworks/CloudKit.framework/Headers/CKRecord.h:9:9: fatal error: 'CoreLocation/CLLocation.h' file not found
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
```
2021-05-17 00:27:04 +09:00
Andrew Childs d2c9670339 darwin: add CoreFoundation to the build when explicitly required 2021-05-17 00:27:02 +09:00
Andrew Childs fe0d5a54c1 darwin/apple-sdk-11.0: inject an sdk for macOS 11 2021-05-17 00:27:01 +09:00