colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #305884 from wegank/chicken-fixes-2 

chickenPackages_5: fix build with clang
This commit is contained in:
Weijia Wang 2024-04-26 11:40:45 +02:00 committed by GitHub
parent c82a0a78f6 2eeab3a893
commit e9fd7afed7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/development/compilers/chicken/5/overrides.nix
View File

@ -36,11 +36,30 @@ in
// (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old);
cmark = addToBuildInputs pkgs.cmark;
dbus = addToBuildInputsWithPkgConfig pkgs.dbus;
epoxy = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy;
epoxy = old:
(addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy old)
// lib.optionalAttrs stdenv.cc.isClang {
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=incompatible-function-pointer-types"
"-Wno-error=int-conversion"
];
};
espeak = addToBuildInputsWithPkgConfig pkgs.espeak-ng;
exif = addToBuildInputsWithPkgConfig pkgs.libexif;
expat = addToBuildInputsWithPkgConfig pkgs.expat;
ezxdisp = addToBuildInputsWithPkgConfig pkgs.xorg.libX11;
expat = old:
(addToBuildInputsWithPkgConfig pkgs.expat old)
// lib.optionalAttrs stdenv.cc.isClang {
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=incompatible-function-pointer-types"
];
};
ezxdisp = old:
(addToBuildInputsWithPkgConfig pkgs.xorg.libX11 old)
// lib.optionalAttrs stdenv.cc.isClang {
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=implicit-function-declaration"
];
};
freetype = addToBuildInputsWithPkgConfig pkgs.freetype;
fuse = addToBuildInputsWithPkgConfig pkgs.fuse;
gl-utils = addPkgConfig;
@ -54,7 +73,14 @@ in
// lib.optionalAttrs stdenv.isDarwin (addToCscOptions "-L -linotify" old);
leveldb = addToBuildInputs pkgs.leveldb;
magic = addToBuildInputs pkgs.file;
mdh = addToBuildInputs pkgs.pcre;
mdh = old:
(addToBuildInputs pkgs.pcre old)
// lib.optionalAttrs stdenv.cc.isClang {
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=implicit-function-declaration"
"-Wno-error=implicit-int"
];
};
# missing dependency in upstream egg
mistie = addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 ]);
mosquitto = addToPropagatedBuildInputs ([ pkgs.mosquitto ]);