diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-03 18:01:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-03 18:01:23 +0000 |
commit | 3c43b804d4b6811cbafbe506113f12e45a13e19d (patch) | |
tree | 6087e2878764002f16f9e435acf303640a9d6c84 /pkgs/development/compilers/chicken | |
parent | 9fbf6ca42f5b74878305fb7925f508b016d2a248 (diff) | |
parent | 8b855b2b4bca486b28a7124b3cda21584e16aa04 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/chicken')
-rw-r--r-- | pkgs/development/compilers/chicken/5/overrides.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 89737e94f489..a5fd3f94830b 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -68,7 +68,10 @@ in scheme2c-compatibility = old: addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ]) (addPkgConfig old); - sdl-base = addToBuildInputs pkgs.SDL; + sdl-base = old: + ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL old) // + # needed for sdl-config to be in PATH + (addToNativeBuildInputs pkgs.SDL old)); sdl2 = old: ((addToPropagatedBuildInputsWithPkgConfig pkgs.SDL2 old) // # needed for sdl2-config to be in PATH @@ -89,7 +92,10 @@ in stfl = old: (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old) // (addToCscOptions "-L -lncurses" old); - taglib = addToBuildInputs [ pkgs.zlib pkgs.taglib ]; + taglib = old: + (addToBuildInputs [ pkgs.zlib pkgs.taglib ] old) // ( + # needed for tablib-config to be in PATH + addToNativeBuildInputs pkgs.taglib old); uuid-lib = addToBuildInputs pkgs.libuuid; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; |