From 58adb5df7d6539da6591b591079d95940404ebda Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 12 Nov 2017 22:25:35 -0600 Subject: [PATCH 1/2] wesnoth: works on darwin --- pkgs/games/wesnoth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 66833ceb2104..d3128210a1be 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = http://www.wesnoth.org/; license = licenses.gpl2; maintainers = with maintainers; [ kkallio abbradar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From c6aba1dba155252df56ed289d0d7533e449650fb Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Sun, 12 Nov 2017 22:23:47 -0600 Subject: [PATCH 2/2] SDL_mixer: disable smpegtest Again to fix timeouts: https://hydra.nixos.org/build/64061277/nixlog/3 --- pkgs/development/libraries/SDL_mixer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 865ddac06bea..d328d80d3898 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl" - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library";