diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-10-27 08:39:40 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2023-10-27 08:40:47 -0400 |
| commit | b810da025f6445ba0914db3082bbaae5bb6f38dc (patch) | |
| tree | 000004aaa30fb967b2e51860eefb70c60e929f9a /pkgs/os-specific/darwin | |
| parent | d73f0a117530ecb453f1dcc4f22eddfb2ab02365 (diff) | |
| download | nixpkgs-b810da025f6445ba0914db3082bbaae5bb6f38dc.tar nixpkgs-b810da025f6445ba0914db3082bbaae5bb6f38dc.tar.gz nixpkgs-b810da025f6445ba0914db3082bbaae5bb6f38dc.tar.bz2 nixpkgs-b810da025f6445ba0914db3082bbaae5bb6f38dc.tar.lz nixpkgs-b810da025f6445ba0914db3082bbaae5bb6f38dc.tar.xz nixpkgs-b810da025f6445ba0914db3082bbaae5bb6f38dc.tar.zst nixpkgs-b810da025f6445ba0914db3082bbaae5bb6f38dc.zip | |
darwin.diskdev_cmds: fix build with clang 16
Fix an implicit `int` on argc, which is an error with newer clangs.
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch | 11 |
2 files changed, 17 insertions, 1 deletions
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 30d123ab804..e4431c68c9a 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 @@ -5,12 +5,17 @@ let xnu-src = if stdenv.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src; arch = if stdenv.isAarch64 then "arm" else "i386"; in appleDerivation { + patches = [ + # Fixes a build failure with newer versions of clang that make implicit int an error. + ./fix-implicit-int.patch + ]; + nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ libutil ]; env.NIX_CFLAGS_COMPILE = "-I."; NIX_LDFLAGS = "-lutil"; - patchPhase = '' + prePatch = '' # ugly hacks for missing headers # most are bsd related - probably should make this a drv unpackFile ${Libc.src} diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch new file mode 100644 index 00000000000..df0fff930da --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch @@ -0,0 +1,11 @@ +diff -ur a/diskdev_cmds.xcodeproj/project.pbxproj b/diskdev_cmds.xcodeproj/project.pbxproj +--- a/quota.tproj/quota.c 2021-10-06 01:13:40.000000000 -0400 ++++ b/quota.tproj/quota.c 2023-10-27 08:24:05.960965958 -0400 +@@ -115,6 +115,7 @@ + + int + main(argc, argv) ++ int argc; + char *argv[]; + { + int ngroups; |