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: 78dd4225e70c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6bedd0b82136
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Nov 11, 2017

  1. SDL: try disabling sdltest on darwin

    @matthewbauer
    matthewbauer committed Nov 11, 2017
    Copy the full SHA
    e19434b View commit details

  2. Merge pull request #31509 from matthewbauer/disable-sdltest 

    SDL: try disabling sdltest on darwin
    @LnL7
    LnL7 authored Nov 11, 2017
    Copy the full SHA
    6bedd0b View commit details
3 changes: 2 additions & 1 deletion pkgs/development/libraries/SDL_gfx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {

buildInputs = [ SDL ] ;

configureFlags = [ "--disable-mmx" ];
configureFlags = [ "--disable-mmx" ]
++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";

meta = with stdenv.lib; {
description = "SDL graphics drawing primitives and support functions";
2 changes: 2 additions & 0 deletions pkgs/development/libraries/SDL_image/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
})
];

configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";

buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ];

meta = with stdenv.lib; {
4 changes: 3 additions & 1 deletion pkgs/development/libraries/SDL_mixer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {

buildInputs = [ SDL libogg libvorbis fluidsynth smpeg ];

configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl";
configureFlags = [ "--disable-music-ogg-shared" ]
++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl"
++ lib.optional stdenv.isDarwin "--disable-sdltest";

meta = with stdenv.lib; {
description = "SDL multi-channel audio mixer library";
2 changes: 2 additions & 0 deletions pkgs/development/libraries/SDL_net/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
};

configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";

propagatedBuildInputs = [ SDL ];

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/development/libraries/SDL_ttf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {

buildInputs = [ SDL freetype ];

configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";

meta = with stdenv.lib; {
description = "SDL TrueType library";
license = licenses.zlib;