diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-05-27 14:18:34 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2023-05-29 16:27:13 -0400 |
| commit | 56480a72c917b020ee8d1ae64f30ef349a513675 (patch) | |
| tree | c2384d1ccdfe845c2fbfb0e6203b845b61f1598d /pkgs/os-specific/darwin/apple-source-releases | |
| parent | 5611fa71ab437f0be9fda35cdeb47df6fdc40659 (diff) | |
| download | nixpkgs-56480a72c917b020ee8d1ae64f30ef349a513675.tar nixpkgs-56480a72c917b020ee8d1ae64f30ef349a513675.tar.gz nixpkgs-56480a72c917b020ee8d1ae64f30ef349a513675.tar.bz2 nixpkgs-56480a72c917b020ee8d1ae64f30ef349a513675.tar.lz nixpkgs-56480a72c917b020ee8d1ae64f30ef349a513675.tar.xz nixpkgs-56480a72c917b020ee8d1ae64f30ef349a513675.tar.zst nixpkgs-56480a72c917b020ee8d1ae64f30ef349a513675.zip | |
darwin.adv_cmds: fix implicit int, which is an error in clang 16
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix index 910b42b0c9d..7d1066a2591 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix @@ -32,6 +32,9 @@ in appleDerivation { substituteInPlace Makefile --replace perl true + substituteInPlace colldef.tproj/scan.l \ + --replace 'static orderpass = 0;' 'static int orderpass = 0;' + for subproject in colldef mklocale monetdef msgdef numericdef timedef; do substituteInPlace usr-share-locale.tproj/$subproject/BSDmakefile \ --replace /usr/share/locale "" \ @@ -42,6 +45,10 @@ in appleDerivation { preBuild = '' cp -r --no-preserve=all ${recentAdvCmds}/colldef . + + substituteInPlace colldef/scan.l \ + --replace 'static orderpass = 0;' 'static int orderpass = 0;' + pushd colldef mv locale/collate.h . flex -t -8 -i scan.l > scan.c diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix index 9c7d4f7702f..e44241171c6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix @@ -6,6 +6,8 @@ appleDerivation { patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib' + substituteInPlace colldef/scan.l \ + --replace 'static orderpass = 0;' 'static int orderpass = 0;' ''; # pkill requires special private headers that are unavailable in |