BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #147646 from ylh/patch-gmu

Browse source 
mpd, game-music-emu: fix aarch64-darwin build
This commit is contained in:
Ben Siraphob 2022-02-06 19:30:18 +00:00 committed by GitHub
commit bd076da1d2
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

2
pkgs/applications/audio/game-music-emu/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz";
sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb";
};
cmakeFlags = lib.optionals stdenv.isDarwin [ "-DENABLE_UBSAN=OFF" ];
nativeBuildInputs = [ cmake ];
meta = with lib; {

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

@ -21444,7 +21444,7 @@ with pkgs;
mod_timestamp = apacheHttpdPackages.mod_timestamp;
inherit (callPackages ../servers/mpd {
stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv;
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;