dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #264421 from nagy/nagy/chicken-fix-build

Browse Source 
chickenPackages.chickenEggs.{taglib,sdl-base}: fix build
This commit is contained in:
Weijia Wang 2023-11-03 15:01:26 +01:00 committed by GitHub
commit dc5cebbe3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/chicken/5/overrides.nix
View File

@ -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;