From edfb1b1d4f2fd0f778357b182a3496fe6053be45 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Apr 2023 11:20:54 +0300 Subject: [PATCH 1/2] chicken: pass CXX_COMPILER --- pkgs/development/compilers/chicken/5/chicken.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 93a68d1ddba0..b1fdde8d8668 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ] ++ (lib.optionals stdenv.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" + "CXX_COMPILER=$(CXX)" "LINKER_OPTIONS=-headerpad_max_install_names" "POSTINSTALL_PROGRAM=install_name_tool" ]); From d51f7d4ef773ef57cb064c192eba1433c673ba19 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Apr 2023 11:22:41 +0300 Subject: [PATCH 2/2] chickenPackages_5.chickenEggs.taglib: unbreak on darwin --- pkgs/development/compilers/chicken/5/overrides.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index e81d17b9df63..4466b116d113 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -64,8 +64,7 @@ in { stemmer = old: (brokenOnDarwin old) // (addToBuildInputs pkgs.libstemmer old); stfl = old: (brokenOnDarwin old) // (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old); - taglib = old: - (brokenOnDarwin old) // (addToBuildInputs [ pkgs.zlib pkgs.taglib ] old); + taglib = addToBuildInputs [ pkgs.zlib pkgs.taglib ]; uuid-lib = addToBuildInputs pkgs.libuuid; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11;