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

Merge pull request #160273 from r-burns/mpd-darwin

Browse source
This commit is contained in:
Martin Weinelt 2022-02-19 01:38:20 +01:00 committed by GitHub
parent d0b5c17b5c 716e8a2939
commit 9fca1860f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/mpd/default.nix
View file

@ -157,6 +157,10 @@ let
outputs = [ "out" "doc" ]
++ lib.optional (builtins.elem "documentation" features_) "man";
CXXFLAGS = lib.optionals stdenv.isDarwin [
"-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0"
];
mesonFlags = [
"-Dtest=true"
"-Dmanpages=true"

1
pkgs/top-level/all-packages.nix
View file

@ -21307,7 +21307,6 @@ with pkgs;
mod_timestamp = apacheHttpdPackages.mod_timestamp;
inherit (callPackages ../servers/mpd {
stdenv = if (with stdenv; cc.isClang && isx86_64) then llvmPackages_8.stdenv else stdenv;
inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit;
}) mpd mpd-small mpdWithFeatures;