Unverified Commit e9fd7afe authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

chickenPackages_5: fix build with clang
parents c82a0a78 2eeab3a8

pkgs/development/compilers/chicken/5/overrides.nix

+30 −4
Original line number Diff line number Diff line
@@ -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 ]);