Commit graph

305 commits

Author SHA1 Message Date
Weijia Wang 12b91012e5 darwin.darling: drop 2023-04-25 22:45:59 +03:00
Weijia Wang a02917d9da darwin.dtrace: get rid of darling 2023-04-25 22:30:55 +03:00
Weijia Wang 93cfea6d37
Merge pull request #225672 from reckenrode/adv_cmds-aarch64-darwin
adv_cmds: fix build on aarch64-darwin
2023-04-11 09:25:38 +03:00
Randy Eckenrode 85f94a09a8
adv_cmds: fix build on aarch64-darwin 2023-04-10 23:20:13 -04:00
Randy Eckenrode 3753dfe6a9
network_cmds: unconditionally exclude Unbound
This fixes build failures caused by LibreSSL 3.4 being marked insecure
and allows it to be dropped from nixpkgs. Unbound is already not built
on aarch64-darwin, and it is not bundled with newer source releases.

Packages that require Unbound should depend on `unbound` from nixpkgs
instead of getting it indirectly from `darwin.network_cmds`.
2023-04-02 20:59:49 -04:00
Vladimír Čunát 6f4400f8fd
darwin.Csu: disable parallel installing
https://hydra.nixos.org/log/s3ndn08vzhfr0zfylbwjqz8fijna4pjl-Csu-85.drv
2023-03-26 10:28:26 +02:00
Alyssa Ross 52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Artturin 6b2a05e190 treewide: manual fixups for
treewide: use toString on list NIX_CFLAGS_COMPILE
treewide: move NIX_CFLAGS_COMPILE to the env attrset
2023-02-22 21:23:04 +02:00
Artturin f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Artturin 6f6cc4a22d treewide: use toString on list NIX_CFLAGS_COMPILE
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
2023-02-22 21:23:04 +02:00
Winter 66f6a84904 darwin.apple_sdk.frameworks.IOKit: fix on x86_64-darwin
7abd144913 switched the source releases to
pull from GitHub. This resulted in the IOUSBFamily installation failing,
as the extracted directory's name changed from `IOUSBFamily-630.4.5` to
`IOUSBFamily-IOUSBFamily-630.4.5`. This didn't occur for any other frameworks
because we used wildcards for copying them already.
2023-02-12 19:30:40 -05:00
Weijia Wang 7abd144913 treewide: update darwin sdk hashes 2023-02-01 12:36:48 +01:00
Martin Weinelt 52029b8e00 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-27 23:50:36 +01:00
Boey Maun Suang fbaface6ff darwin.dtrace: Fix failing build
What dtrace needs from the CoreSymbolication private framework on Darwin
is provided in Nixpkgs by two different packages, but both of their full
attribute paths end in CoreSymbolication.

This commit therefore does two things:
- adds the second CoreSymbolication package to dtrace's dependencies;
  and
- adds an alias for the second CoreSymbolication package to avoid
  having to explicitly name or rename it when calling the dtrace
  package in the existing contexts.
2023-01-27 12:47:22 +11:00
github-actions[bot] 05972e9778
Merge staging-next into staging 2023-01-09 18:01:58 +00:00
Weijia Wang 9957ee5fd6 darwin: add usage to generate-sdk-packages.sh 2023-01-09 13:08:37 +01:00
Weijia Wang 2bd3048ea4 darwin: fix generate-sdk-packages.sh 2023-01-09 13:08:09 +01:00
Felix Bühler 1302f3bd27
apple-source-release: deprecate phases (#161535) 2023-01-07 17:20:01 -05:00
Artturin 7e49471316 treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
Jiajie Chen 20447fd0dc darwin.network_cmds: fix build on aarch64-darwin
- Use network_cmds from macOS 11.0 packages
- Fix TARGET_OS_IPHONE error
- Disable unbound on aarch64-darwin
2022-07-24 09:53:59 +08:00
github-actions[bot] 4bff9bab6b
Merge staging-next into staging 2022-07-10 12:02:29 +00:00
Chen 8073a6fb09
darwin.xnu: fix build on aarch64-darwin (#179921)
- Use xnu from macOS 11.0 packages
- Patch iig related usage
- Add a new list of headers for arm64
2022-07-09 10:39:31 -04:00
ajs124 f76d71f98f darwin.network_cmds:: pin to libressl 3.4 2022-07-07 22:11:54 +02:00
ajs124 a8517f95b8 maintainers: remove joelteon
no github account linked
2022-06-29 00:52:14 +02:00
github-actions[bot] 1a1be0c727
Merge staging-next into staging 2022-06-09 18:01:58 +00:00
Sergei Trofimovich d07b20daf3
Merge pull request #176389 from trofi/workaround-fno-common-for-darwin.developer_cmds
darwin.developer_cmds: add -fcommon workaround
2022-06-09 17:23:21 +00:00
Sergei Trofimovich daa44b3509
Merge pull request #176394 from trofi/workaround-fno-common-for-darwin.file_cmds
darwin.file_cmds: add -fcommon workaround
2022-06-09 17:23:01 +00:00
Sergei Trofimovich f436bf1145
Merge pull request #176351 from trofi/workaround-fno-common-for-darwin.top
darwin.top: add -fcommon workaround
2022-06-09 17:13:11 +00:00
Martin Weinelt 6451e9d4a5 Merge remote-tracking branch 'origin/staging-next' into staging 2022-06-08 22:22:26 +02:00
Sergei Trofimovich 7d6048d0ad darwin.file_cmds: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
clang-11. Otherwise build fails as:

    duplicate symbol '_chdname' in: ar_io.o tty_subs.o
2022-06-05 14:03:44 +01:00
Sergei Trofimovich d3805f8df5 darwin.dtrace: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
clang-11. Otherwise build fails as:

    duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o
2022-06-05 13:53:22 +01:00
Sergei Trofimovich 2923e72443 darwin.developer_cmds: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
clang-11. Otherwise build fails as:

    duplicate symbol '_btype_2' in:args.o pr_comment.o
2022-06-05 13:40:50 +01:00
Sergei Trofimovich 6868bb9ceb darwin.top: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
clang-11. Otherwise build fails as:

    duplicate symbol '_tsamp' in: main.o top.o
2022-06-05 10:11:41 +01:00
Dmitry Kalinkin df2ded87a3
darwin.bsdmake: fix for systems with non-standard RLIMIT_NOFILE 2022-05-15 10:53:50 -04:00
toonn 7fb011df89 Libsystem: Update headers.txt
Replacing `cpio -pdm` with `copyHierarchy` makes us end up with two
extra headers. I'm not sure why this happens, there's no reason why
`cpio` should miss those headers.
2022-05-05 11:53:52 -04:00
toonn 972c7e99ff Libsystem: Replace cpio with copyHierarchy
I noticed every time building Libsystem that there was a very slow phase
where the output consisted of many lines like `42 blocks`. This is
output from cpio and in brief testing it takes at least twice as long to
go through cpio for the simple copies we want to make. The interface is
very convenient but the performance penalty is very painful so I decided
to implement a function that emulates cpio's interface.

On my machine with a 7200 RPM HDD this speeds up the build from about
250 minutes to about 75 seconds, a factor of 200! I'm not certain the
results on modern hardware would be similarly positive so this could use
further testing.
2022-05-05 11:53:52 -04:00
Will Cohen 36b5da498c darwin.network_cmds: switch openssl to libressl 2022-04-26 13:42:04 -04:00
ajs124 49c51cdd51 openssl_1_0_2: drop 2022-04-04 15:37:05 +01:00
Jonathan Ringer e74ccf2d72
Merge pull request #154708 from NixOS/staging-next
Staging next 2022-01-12
2022-01-25 11:54:52 -08:00
Dmitry Kalinkin d3ec14f6cb
darwin.text_cmds: fix build 2022-01-23 08:18:46 -05:00
Devin Singh c74a7840e2
diskdev_cmds: fix build using arch's xnu source 2022-01-18 06:52:26 -06:00
Randy Eckenrode a42a04fadd
libresolv: fix build on aarch64-darwin
Use `configdHeaders` instead of `configd`.  This fixes #134292.
2022-01-03 21:32:52 -05:00
Randy Eckenrode 3791603924
configdHeaders: init at 453.19
`configd` is aliased to `apple-sdk.frameworks.SystemConfiguration` in
apple-sdk-11.0, which is the default on aarch64-darwin, but it does not
include all of the headers.  This package introduces the missing
headers, which are needed to build `libresolv`.

A subsequent commit will fix libresolv to build on aarch64-darwin.
2022-01-03 21:32:52 -05:00
toonn e33c11a557 Libc: Merge TARGET_OS_EMBEDDED patches
Both patches implement the same fix so they'll probably have to be
removed at the same time. This avoids one of them being left behind.
2021-11-24 15:17:13 -08:00
toonn 459dc34b2b Libc: Define target in stdio too 2021-11-24 15:17:13 -08:00
toonn 5aa4c46dcd Libc: Define target instead of including
Including `TargetConditionals.h` had knock-on effects, breaking the zlib
build because `TARGET_OS_MAC` gets defined, for instance.

Defining `TARGET_OS_EMBEDDED` to be `0` if it's not defined is simpler
and maintains the default behavior so it shouldn't break any dependents.
2021-11-24 15:17:13 -08:00
toonn 99bef31835 Libc: stdlib uses undefined TARGET_OS_EMBEDDED 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
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