nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-18 13:50:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-09-09 13:13:20 +00:00
committed by GitHub
parent 0ef8af0953 1c8d52a3a2
commit 3fbcbb33f6
22 changed files with 70 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,11 +90,13 @@ in
glut =
old:
(brokenOnDarwin old)
// (addToCscOptions [
"-I${(lib.getDev pkgs.libglut)}/include"
"-I${(lib.getDev pkgs.libGL)}/include"
"-I${(lib.getDev pkgs.libGLU)}/include"
] old)
// lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) (
addToCscOptions [
"-I${(lib.getDev pkgs.libglut)}/include"
"-I${(lib.getDev pkgs.libGL)}/include"
"-I${(lib.getDev pkgs.libGLU)}/include"
] old
)
// (addToBuildInputs pkgs.libglut old);
iconv = addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv);
icu = addToBuildInputsWithPkgConfig pkgs.icu;