Unverified Commit bd076da1 authored by Ben Siraphob's avatar Ben Siraphob Committed by GitHub
Browse files

Merge pull request #147646 from ylh/patch-gmu 

mpd, game-music-emu: fix aarch64-darwin build
parents e89cdd44 c544e709

pkgs/applications/audio/game-music-emu/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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; {

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;