From 09858c0a653ee27fab1cb44b02a21c2288118ce4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 14 Jun 2023 23:19:19 +0300 Subject: [PATCH] chickenPackages_5.chickenEggs.scheme2c-compatibility: fix build on x86_64-darwin --- pkgs/development/compilers/chicken/5/overrides.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index e707190adc05..36c3f1ad4b05 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -1,6 +1,9 @@ { stdenv, pkgs, lib, chickenEggs }: let inherit (lib) addMetaAttrs; + addToNativeBuildInputs = pkg: old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ lib.toList pkg; + }; addToBuildInputs = pkg: old: { buildInputs = (old.buildInputs or [ ]) ++ lib.toList pkg; }; @@ -59,7 +62,9 @@ in plot = addToBuildInputs pkgs.plotutils; postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql; rocksdb = addToBuildInputs pkgs.rocksdb; - scheme2c-compatibility = addPkgConfig; + scheme2c-compatibility = old: + addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ]) + (addPkgConfig old); sdl-base = addToBuildInputs pkgs.SDL; sdl2 = addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2; sdl2-image = addToBuildInputs pkgs.SDL2_image;