Merge pull request #225859 from wegank/chicken-cxx
chickenPackages_5.chickenEggs.taglib: unbreak on darwin
This commit is contained in:
commit
3ea257209d
|
@ -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"
|
||||
]);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue