From cabf66eefaffdc3e2faf63e081934f2c5587125a Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 21 Sep 2022 12:19:14 +0200 Subject: [PATCH 1/2] pkgsMusl.game-music-emu: fix build --- 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 b54bf789f6b2..a10aace767be 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" ]; + cmakeFlags = lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ "-DENABLE_UBSAN=OFF" ]; nativeBuildInputs = [ cmake removeReferencesTo ]; # It used to reference it, in the past, but thanks to the postFixup hook, now From 54ce4e4eaaa5796f11149f18f927d8cea8bb7464 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 21 Sep 2022 15:19:40 +0200 Subject: [PATCH 2/2] game-music-emu: to pkgs/development/libraries --- .../libraries}/audio/game-music-emu/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{applications => development/libraries}/audio/game-music-emu/default.nix (100%) diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/development/libraries/audio/game-music-emu/default.nix similarity index 100% rename from pkgs/applications/audio/game-music-emu/default.nix rename to pkgs/development/libraries/audio/game-music-emu/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e599e5cc261..28f54ec58f60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18362,6 +18362,8 @@ with pkgs; gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { }; + game-music-emu = callPackage ../development/libraries/audio/game-music-emu { }; + gamin = callPackage ../development/libraries/gamin { }; fam = gamin; # added 2018-04-25 @@ -28152,8 +28154,6 @@ with pkgs; g933-utils = callPackage ../tools/misc/g933-utils { }; - game-music-emu = callPackage ../applications/audio/game-music-emu { }; - gavrasm = callPackage ../development/compilers/gavrasm { }; gcalcli = callPackage ../applications/misc/gcalcli { };