Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3c9b356e10e6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 81cc9bb41d75
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 13, 2017

  1. wesnoth: works on darwin

    @matthewbauer
    matthewbauer committed Nov 13, 2017
    Copy the full SHA
    58adb5d View commit details

  2. SDL_mixer: disable smpegtest 

    Again to fix timeouts:

https://hydra.nixos.org/build/64061277/nixlog/3
    @matthewbauer
    matthewbauer committed Nov 13, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c6aba1d View commit details

Commits on Nov 21, 2017

  1. Merge pull request #31701 from matthewbauer/wesnoth-mac 

    Wesnoth MacOS
    @copumpkin
    copumpkin authored Nov 21, 2017
    Copy the full SHA
    81cc9bb View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/development/libraries/SDL_mixer/default.nix
  2. +1 −1 pkgs/games/wesnoth/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/SDL_mixer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
2 changes: 1 addition & 1 deletion pkgs/games/wesnoth/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}