b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #225859 from wegank/chicken-cxx

Browse source 
chickenPackages_5.chickenEggs.taglib: unbreak on darwin
This commit is contained in:
Weijia Wang 2023-04-12 14:21:29 +03:00 committed by GitHub
parent 2a3291834f d51f7d4ef7
commit 3ea257209d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/compilers/chicken/5/chicken.nix
View file

@ -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"
]);

3
pkgs/development/compilers/chicken/5/overrides.nix
View file

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