Merge pull request #147646 from ylh/patch-gmu
mpd, game-music-emu: fix aarch64-darwin build
commitbd076da1d267387429d842ebfd07fc61eb84885c
authorBen Siraphob <bensiraphob@gmail.com>
dateSun 6 Feb 2022, 19:30 (5 years ago)
parente89cdd4c544e70
pkgs/applications/audio/game-music-emu/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz";
99 sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb";
1010 };
11−
11+ cmakeFlags = lib.optionals stdenv.isDarwin [ "-DENABLE_UBSAN=OFF" ];
1212 nativeBuildInputs = [ cmake ];
1313
1414 meta = with lib; {
pkgs/top-level/all-packages.nix+1−1
@@ -21444,7 +21444,7 @@ with pkgs;
2144421444 mod_timestamp = apacheHttpdPackages.mod_timestamp;
2144521445
2144621446 inherit (callPackages ../servers/mpd {
21447− stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv;
21447+ stdenv = if (with stdenv; cc.isClang && isx86_64) then llvmPackages_8.stdenv else stdenv;
2144821448 inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit;
2144921449 }) mpd mpd-small mpdWithFeatures;
2145021450