mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-25 14:48:25 +03:00
darwin.adv_cmds: fix implicit int, which is an error in clang 16
This commit is contained in:
parent
5611fa71ab
commit
56480a72c9
@ -32,6 +32,9 @@ in appleDerivation {
|
|||||||
|
|
||||||
substituteInPlace Makefile --replace perl true
|
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
|
for subproject in colldef mklocale monetdef msgdef numericdef timedef; do
|
||||||
substituteInPlace usr-share-locale.tproj/$subproject/BSDmakefile \
|
substituteInPlace usr-share-locale.tproj/$subproject/BSDmakefile \
|
||||||
--replace /usr/share/locale "" \
|
--replace /usr/share/locale "" \
|
||||||
@ -42,6 +45,10 @@ in appleDerivation {
|
|||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
cp -r --no-preserve=all ${recentAdvCmds}/colldef .
|
cp -r --no-preserve=all ${recentAdvCmds}/colldef .
|
||||||
|
|
||||||
|
substituteInPlace colldef/scan.l \
|
||||||
|
--replace 'static orderpass = 0;' 'static int orderpass = 0;'
|
||||||
|
|
||||||
pushd colldef
|
pushd colldef
|
||||||
mv locale/collate.h .
|
mv locale/collate.h .
|
||||||
flex -t -8 -i scan.l > scan.c
|
flex -t -8 -i scan.l > scan.c
|
||||||
|
@ -6,6 +6,8 @@ appleDerivation {
|
|||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
|
substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
|
||||||
--replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib'
|
--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
|
# pkill requires special private headers that are unavailable in
|
||||||
|
Loading…
Reference in New Issue
Block a user