Sandro Jäckel
7e9d442837
darwin.CF: Add pre-/postBuild hooks to buildPhase
2021-11-24 15:17:13 -08:00
toonn
3b2d3f65b7
darwin.CF: Drop clang 7 workaround
2021-11-24 15:17:13 -08:00
toonn
2bb0e256ea
darwin.CF: Include missing TARGET_OS_* defines
...
This patch is static and may not be appropriate if the compilation
target is iOS.
2021-11-24 15:17:13 -08:00
toonn
84454c3233
darwin.Libsystem: Patch TargetConditionals.h
...
`TargetConditionals.h` was missing several definitions, like
`TARGET_OS_TV` that are part of SDK 10.12 at least. And one that doesn't
seem to occur in any SDK afaict, `TARGET_OS_EMBEDDED_OTHER`.
I added the definitions from SDK 10.12 verbatim and defined
`TARGET_OS_EMBEDDED_OTHER` to be equal to `0`.
I think none of this works if `darwin.Libsystem` is used to build for
linux or iOS though so maybe this needs a more thorough fix?
This reverts 336d82617f
because it's no
longer necessary.
2021-11-24 15:17:13 -08:00
toonn
e07eef85e8
xnu: Fix python3 patch
...
This reverts 7da313e10a
because it's no
longer necessary.
2021-11-24 15:17:13 -08:00
Jan Tojnar
b8c07facaa
Fix eval with nix-env -qas
...
At least on NixOS, it fails to evaluate as follows:
$ nix-env -qaPs -f .
error: attribute '__propagatedImpureHostDeps' missing
2021-11-17 16:28:55 +01:00
Felix Buehler
9480444dae
treewide: rename name to pname&version
2021-11-09 22:24:57 +01:00
Lein Matsumaru
ae4666c415
darwin.rewrite-tbd: only build on darwin
2021-11-08 13:11:29 +00:00
Andrew Childs
e456e9b1ae
sigtool: 0.1.0 -> 0.1.2
...
Fixes build on x86_64-darwin
2021-09-25 10:38:35 +09:00
Michael Stone
470466fdbd
sigtool: 4a3719b4 -> 2a13539d ( #138453 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-09-23 17:14:07 +02:00
github-actions[bot]
6f038e8b11
Merge master into staging-next
2021-09-14 12:01:03 +00:00
Emily
35a1ca8a0a
darwin.trash: fix on aarch64-darwin
...
None of these clang options should be necessary with the nixpkgs stdenv
infrastructure, and the -arch was breaking Apple Silicon builds.
2021-09-14 03:31:31 +01:00
github-actions[bot]
dbad333a72
Merge master into staging-next
2021-08-28 12:01:06 +00:00
Domen Kožar
09818c59fa
Merge pull request #135345 from prusnak/ghc-aarch64-darwin
...
ghc: enable build on aarch64-darwin (aka Apple Silicon)
2021-08-28 13:10:55 +02:00
Pavol Rusnak
236fd9c902
darwin.signingUtils: move signDarwinBinariesIn from fixupOutputHooks to postFixupHooks
...
to fix ghc build
2021-08-28 12:54:05 +02:00
github-actions[bot]
b13b005f0e
Merge master into staging-next
2021-08-26 12:01:09 +00:00
zowoq
13ea123c74
treewide: buildFlagsArray -> ldflags
2021-08-26 21:35:06 +10:00
Jan Tojnar
4ff3577f25
Merge branch 'staging-next' into staging
2021-08-23 14:19:54 +02:00
github-actions[bot]
1f6dedd364
Merge master into haskell-updates
2021-08-18 00:05:52 +00:00
Jan Tojnar
e286e1cfa0
Merge branch 'staging-next' into staging
...
- boost 167 removed on staging-next (7915d1e03f
) × boost attributes are inherited on staging (d20aa4955d
)
- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507
) × hardened kernels are versioned on staging (a5341beb78
) + removed linux_5_12 (e55554491d
)
- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
2021-08-17 18:52:37 +02:00
Jasper
00037f7403
darwin.binutils: fix wrapper of as
when cross-compiling to aarch64-darwin ( #134097 )
2021-08-16 22:12:51 -04:00
sternenseemann
283d622397
darwin.xattr: init at 61.60.1
2021-08-14 17:06:29 +02:00
Dmitry Kalinkin
dda4394889
Merge pull request #127229 from veprbl/pr/libsystem_targetconditionals
...
darwin.Libsystem: add definitions TARGET_OS_{IOS,WATCH,BRIDGE,TV,SIMULATOR,NANO} to TargetConditionals.h
2021-08-06 02:14:09 -04:00
Angus Trau
6395aaba17
darwin.apple_sdk.frameworks.AVFoundation: Add missing dependencies
2021-08-01 12:51:26 +10:00
Sandro
d0f62aae75
Merge pull request #130501 from SuperSandro2000/remove-noop-phases-mass
...
Convert phases that contain ":" to dont* = true
2021-07-18 23:46:50 +02:00
Sandro Jäckel
dc48d23a0f
Convert phases that contain ":" to dont* = true
2021-07-17 23:39:16 +02: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
Andrew Childs
55dcd99859
root: use pure CoreSymbolication on Darwin
...
The current build works by linking against CoreSymbolication in
/System/Library/PrivateFrameworks. This is impure and doesn't work in
newer versions of macOS.
See https://github.com/NixOS/nixpkgs/issues/128576
2021-06-29 11:00:05 +09:00
Dmitry Kalinkin
03137b50d2
darwin.Libsystem: add definitions TARGET_OS_{IOS,WATCH,BRIDGE,TV,SIMULATOR,NANO} to TargetConditionals.h
...
These are defined in the SDK for Apple compilers and some projects assume those are defined unconditionally.
https://reviews.llvm.org/D103598
2021-06-17 11:01:16 -04:00
Jonathan Ringer
d1d37feb6d
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
Jason Lau
8a2d578017
reattach-to-user-namespace: support apple silicon
2021-06-15 11:30:21 -07:00
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
Andrew Childs
5268bf50d2
apple_sdk.libs.sandbox: init
2021-03-20 11:32:32 -04:00
Jan Tojnar
0136206b12
Merge branch 'master' into staging-next
2021-03-18 13:35:59 +01:00
Ivan Babrou
a730703e6f
darwin.binutils: use clang for as on aarch64-darwin ( #115167 )
...
Without this change `as` on `aarch64-darwin` is defunct:
```
$ /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/bin/as -v
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/bin/as: assembler (/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm64/as or /nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm64/as) for architecture arm64 not installed
Installed assemblers are:
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/ppc64/as for architecture ppc64
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/x86_64/as for architecture x86_64
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/ppc/as for architecture ppc
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/i386/as for architecture i386
/nix/store/g11xba8ch20zndaf32hfnap46z47b5k3-cctools-port-949.0.1/libexec/as/arm/as for architecture arm
```
Apple defaults to Clang in all cases from what I see, but nixpkgs prefers `cctools`: #51881 .
2021-03-17 00:27:34 -04:00
github-actions[bot]
d6257d451b
Merge master into staging-next
2021-03-11 18:23:54 +00:00
Eric Bailey
9628427a85
m-cli: remove maintainer
2021-03-10 20:56:05 -06:00
Andrew Childs
e6be0f45ef
darwin.bootstrap_cmds: use correct arch in "mig"
2021-03-03 11:01:24 +09:00
Andrew Childs
8feb949ab5
darwin/xcode: remove -arch flags
...
These are now provided by the standard bintools and cc wrappers.
2021-03-02 17:22:06 +09:00
github-actions[bot]
344456f66a
Merge master into staging-next
2021-02-12 00:36:19 +00:00
Mathieu Post
7c9c8a1fd0
Goku: 0.1.11 -> 0.3.6
2021-02-10 15:37:33 +01:00
github-actions[bot]
571eb10996
Merge staging-next into staging
2021-02-03 18:22:22 +00:00
Sandro
0829a51862
Merge pull request #109626 from holymonson/darwin-impure-cmds
...
darwin: add impure-cmds
2021-02-03 18:11:58 +01:00
Dmitry Kalinkin
f602c10ea7
Merge pull request #109368 from holymonson/check-headers
...
darwin: check apple headers
2021-02-01 12:12:03 -05:00
Dmitry Kalinkin
98cc48e3f7
Merge pull request #109052 from holymonson/bootstrap_cmds
...
darwin.bootstrap_cmds: update to 121
2021-01-31 19:07:51 -05:00
Dmitry Kalinkin
84b3d08ba6
Merge pull request #111057 from veprbl/pr/darwin_CF_fix_sandboxing
...
darwin.CF: fix sandboxed build
2021-01-30 19:30:51 -05:00
Monson Shao
c12df57435
darwin.apple-source-releases: implement headers check
2021-01-30 21:37:46 +08:00
Monson Shao
4bc22226a2
darwin.hfs: add appleHeaders and set headersOnly=true by default
2021-01-30 21:37:46 +08:00
Monson Shao
0681f7f979
darwin.Libsystem: add appleHeaders
2021-01-30 21:37:46 +08:00
Monson Shao
e2fb835ce2
darwin.xnu: add appleHeaders
2021-01-30 21:37:46 +08:00
Monson Shao
1eb3a0d5c9
darwin.Libc: add appleHeaders
2021-01-30 21:37:46 +08:00