pyrox.dev
Merge pull request #305884 from wegank/chicken-fixes-2
chickenPackages_5: fix build with clang
authored by Weijia Wang and committed by GitHub e9fd7afe c82a0a78
+30
-4
pkgs/development/compilers/chicken/5/overrides.nix
+30
-4
pkgs/development/compilers/chicken/5/overrides.nix
···
36
36
// (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old);
37
37
cmark = addToBuildInputs pkgs.cmark;
38
38
dbus = addToBuildInputsWithPkgConfig pkgs.dbus;
39
-
epoxy = addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy;
39
+
epoxy = old:
40
+
(addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy old)
41
+
// lib.optionalAttrs stdenv.cc.isClang {
42
+
env.NIX_CFLAGS_COMPILE = toString [
43
+
"-Wno-error=incompatible-function-pointer-types"
44
+
"-Wno-error=int-conversion"
45
+
];
46
+
};
40
47
espeak = addToBuildInputsWithPkgConfig pkgs.espeak-ng;
41
48
exif = addToBuildInputsWithPkgConfig pkgs.libexif;
42
-
expat = addToBuildInputsWithPkgConfig pkgs.expat;
43
-
ezxdisp = addToBuildInputsWithPkgConfig pkgs.xorg.libX11;
49
+
expat = old:
50
+
(addToBuildInputsWithPkgConfig pkgs.expat old)
51
+
// lib.optionalAttrs stdenv.cc.isClang {
52
+
env.NIX_CFLAGS_COMPILE = toString [
53
+
"-Wno-error=incompatible-function-pointer-types"
54
+
];
55
+
};
56
+
ezxdisp = old:
57
+
(addToBuildInputsWithPkgConfig pkgs.xorg.libX11 old)
58
+
// lib.optionalAttrs stdenv.cc.isClang {
59
+
env.NIX_CFLAGS_COMPILE = toString [
60
+
"-Wno-error=implicit-function-declaration"
61
+
];
62
+
};
44
63
freetype = addToBuildInputsWithPkgConfig pkgs.freetype;
45
64
fuse = addToBuildInputsWithPkgConfig pkgs.fuse;
46
65
gl-utils = addPkgConfig;
···
54
73
// lib.optionalAttrs stdenv.isDarwin (addToCscOptions "-L -linotify" old);
55
74
leveldb = addToBuildInputs pkgs.leveldb;
56
75
magic = addToBuildInputs pkgs.file;
57
-
mdh = addToBuildInputs pkgs.pcre;
76
+
mdh = old:
77
+
(addToBuildInputs pkgs.pcre old)
78
+
// lib.optionalAttrs stdenv.cc.isClang {
79
+
env.NIX_CFLAGS_COMPILE = toString [
80
+
"-Wno-error=implicit-function-declaration"
81
+
"-Wno-error=implicit-int"
82
+
];
83
+
};
58
84
# missing dependency in upstream egg
59
85
mistie = addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 ]);
60
86
mosquitto = addToPropagatedBuildInputs ([ pkgs.mosquitto ]);