Jan Tojnar
91171e2955
Merge branch 'master' into staging-next
...
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
Sandro
b083c7e9eb
darwin.mas: Fix dontBuild
2021-06-14 14:59:21 +02:00
github-actions[bot]
65a7d168af
Merge master into staging-next
2021-06-12 18:04:56 +00:00
Zach Coyle
88fc8922a4
mas: 1.8.1 -> 1.8.2
2021-06-11 19:22:35 -04: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
Andrew Childs
e592d342da
darwin.ICU: avoid platform.darwinMinVersion references on non-darwin
...
This package isn't expected to work outside of darwin, but must still
evaluate cleanly.
2021-05-17 00:28:05 +09:00
Andrew Childs
3706fe567b
darwin.DarwinTools: remove reference to CFPriv.h
...
Fixes build on aarch64-darwin.
2021-05-17 00:28:05 +09: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
Ivan Babrou
d0eff87f68
darwin.file_cmds: add missing Libinfo dependency
...
Fixing:
```
/private/tmp/nix-build-file_cmds-264.1.1-osx-10.11.6.drv-0/file_cmds-264.1.1/ls/print.c:56:10: fatal error: 'membershipPriv.h' file not found
^~~~~~~~~~~~~~~~~~
1 error generated.
```
2021-05-17 00:27:03 +09:00
Ivan Babrou
577bcf38f8
darwin.shell_cmds: add missing dependency on launchd
2021-05-17 00:27:03 +09:00
Ivan Babrou
da3ae0231a
apple-source-releases: make it compile on aarch64
2021-05-17 00:27:03 +09:00
Ivan Babrou
2eb97f2ddd
darwin.developer_cmds: wrap clang -E from clang-wrapped as clang-cpp
2021-05-17 00:27:03 +09:00
Andrew Childs
d2c9670339
darwin: add CoreFoundation to the build when explicitly required
2021-05-17 00:27:02 +09:00
Matthew Bauer
3e7034abb9
darwin/xcode: provide libc++ from XCode toolchain
...
We could use our own libc++ here, but it is probably best to use the
provided one to ensure consistency. This fixes some C++ programs when
running aarch64-apple-ios-clang++.
2021-05-17 00:27:02 +09:00
Andrew Childs
7eb1e3695d
darwin.signingUtils: init
...
Helper scripts for code signing on darwin.
2021-05-17 00:27:02 +09:00
Andrew Childs
4c890ce9aa
darwin.sigtool: init
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
Andrew Childs
0ba7a04743
darwin/binutils: include codesign_allocate
2021-05-17 00:27:01 +09:00
Andrew Childs
eb8f8afac7
libtapi: cross compilation
2021-05-17 00:27:01 +09:00
Andrew Childs
b7abec31d4
rewrite-tbd: init
2021-05-17 00:27:01 +09:00
Andrew Childs
257cb1c8e8
print-reexports: rehome, tbd4 support, cross compilation
2021-05-17 00:27:01 +09:00
Andrew Childs
bd4a45f5d4
cctools: drop suspicious dependency
2021-05-17 00:27:00 +09:00
Andrew Childs
cbe172fa67
darwin.ICU: cross compilation
2021-05-17 00:27:00 +09:00
Andrew Childs
aa3361326b
darwin.adv_cmds: fix cross compilation
2021-05-17 00:27:00 +09:00
John Ericson
7bba32a069
darwin packages: Get ready for cross
...
If things build fine with `stdenvNoCC`, let them use that. If tools
might be prefixed, prepare for that, either by directly splicing or just
using the env vars provided by the wrapper setup-hooks.
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2021-05-11 16:07:01 -04:00
John Ericson
a3e54cb582
Merge remote-tracking branch 'upstream/staging-next' into staging
2021-05-06 15:48:25 -04:00
John Ericson
470640e7fe
treewide: Do a number of no-op cleanups for cross and darwin
...
I am taking the non-invasive parts of #110914 to hopefully help out with #111988 .
In particular:
- Use `lib.makeScopeWithSplicing` to make the `darwin` package set have
a proper `callPackage`.
- Adjust Darwin `stdenv`'s overlays keeping things from the previous
stage to not stick around too much.
- Expose `binutilsNoLibc` / `darwin.binutilsNoLibc` to hopefully get us
closer to a unified LLVM and GCC bootstrap.
2021-05-06 11:17:26 -04:00
Andrew Childs
7869d16545
llvmPackages: Multuple outputs for everythting
...
Also begin to start work on cross compilation, though that will have to
be finished later.
The patches are based on the first version of
https://reviews.llvm.org/D99484 . It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.
Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.
----
Other misc notes, highly incomplete
- lvm-config-native and llvm-config are put in `dev` because they are
tools just for build time.
- Clang no longer has an lld dep. That was introduced in
db29857eb3
, but if clang needs help
finding lld when it is used we should just pass it flags / put in the
resource dir. Providing it at build time increases critical path
length for no good reason.
----
A note on `nativeCC`:
`stdenv` takes tools from the previous stage, so:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`
while:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
github-actions[bot]
f42b75df03
Merge staging-next into staging
2021-04-18 18:10:40 +00:00
github-actions[bot]
b57b2b362c
Merge master into staging-next
2021-04-18 18:10:37 +00:00
Dmitry Kalinkin
6eeab63be4
Merge pull request #107431 from veprbl/pr/darling_src_fix
...
darwin.darling.src: fix build on case-sensitive filesystems
2021-04-18 09:55:45 -04:00
github-actions[bot]
33182b194a
Merge staging-next into staging
2021-04-17 18:10:41 +00:00
github-actions[bot]
8156636ab9
Merge master into staging-next
2021-04-17 18:10:38 +00:00
Pavol Rusnak
29bb19258a
treewide: use https for github URIs
2021-04-17 17:59:08 +02:00
Calum MacRae
28192c446c
spacebar: fix builds on macOS Big Sur
2021-04-16 17:19:17 +01:00
Calum MacRae
2c82907da4
apple-sdk: generate SkyLight framework outputs
2021-04-16 17:19:17 +01:00
Calum MacRae
914c604a01
apple-sdk: fix PrivateFrameworks symlinks
...
With the absence of these symlinks, private frameworks aren't exposed
to the linker.
2021-04-16 17:19:17 +01:00
John Ericson
82ca81cd62
Merge pull request #111988 from thefloweringash/darwin-platform-versions
...
Darwin platform versions
2021-04-12 11:40:16 -04:00
Andrew Childs
33265e0dd9
darwin/xcode: remove platform version flags
...
These are now provided by the standard bintools and cc wrappers.
2021-04-11 09:47:10 +09:00
midchildan
87f578a36f
sshfs: add darwin build
2021-04-06 10:37:53 +09:00
Sandro Jäckel
f9bcee4ed5
darwin.text_cmds: Fix editor check
2021-04-04 19:49:52 +02:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias
2021-04-04 19:49:52 +02:00
Sandro Jäckel
33a395f195
yacc: deprecate alias
...
and add a new line after the alphabetically sorting to please my inner monk
2021-04-04 03:18:58 +02:00
Zach Coyle
c7c2e2f54f
mas: init at 1.8.1
2021-04-02 12:14:36 -04:00
midchildan
c595604bed
fuse: use macfuse-stubs instead on Darwin
2021-03-23 23:42:16 +09:00
Bernardo Meurer
1d1089dbf4
Merge pull request #116958 from midchildan/package/macfuse
...
macfuse-stubs: replace osxfuse 3.8.3
2021-03-21 07:28:48 +00:00
midchildan
fa6c8b656b
macfuse-stubs: init at 4.0.4
...
replaces osxfuse 3.8.3
2021-03-21 15:50:13 +09:00