From 2eeab3a8933f5fb53329511b4e1cbe3e9aba829c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 22 Apr 2024 04:53:30 +0200 Subject: [PATCH] chickenPackages_5: fix build with clang --- .../compilers/chicken/5/overrides.nix | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index adaad31b52bb..863850818c68 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -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 ]);