From b49e88c199cb62858584e36c5f08a084480d1bfc Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Sat, 27 Nov 2021 18:09:44 -0800 Subject: [PATCH 1/2] game-music-emu: turn off ubsan on darwin --- pkgs/applications/audio/game-music-emu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index a2aebc58a825..55f12fd3c64a 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -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; { From c544e709d1256166941610d724b0c7a091399ace Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Sat, 27 Nov 2021 19:36:25 -0800 Subject: [PATCH 2/2] mpd: restrict stdenv override to x86_64-darwin see also: 2ae8d4b newer mpd versions require c++17, which is troublesome with the 10.12 sdk used for x86_64-darwin stdenvs, but the binary sdk on aarch64-darwin has c++17. more crucially, llvmPackages_8.compiler-rt is busted on aarch64-darwin. this makes mpd build on both darwin archs. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc5728ac01ed..eda4b1102600 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20971,7 +20971,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;