Skip to content

Commit

Permalink
Merge pull request #36389 from cpages/sdl2
Browse files Browse the repository at this point in the history
Sdl2 and friends update
  • Loading branch information
7c6f434c committed Mar 6, 2018
2 parents 2372e93 + 08049f4 commit c8664a2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions pkgs/development/libraries/SDL2/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ let
in
stdenv.mkDerivation rec {
name = "SDL2-${version}";
version = "2.0.7";
version = "2.0.8";

src = fetchurl {
url = "http://www.libsdl.org/release/${name}.tar.gz";
sha256 = "0pjdpxla5kh1w1b0shxrx97a116vyy31njxi0jhyvqhk8d6cfdgf";
sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd";
};

outputs = [ "out" "dev" ];
Expand Down
11 changes: 6 additions & 5 deletions pkgs/development/libraries/SDL2_gfx/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{ stdenv, darwin, fetchurl, SDL2 }:

stdenv.mkDerivation rec {
name = "SDL2_gfx-${version}";
version = "1.0.1";
name = "${pname}-${version}";
pname = "SDL2_gfx";
version = "1.0.4";

src = fetchurl {
url = "mirror://sourceforge/sdl2gfx/${name}.tar.gz";
sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn";
url = "http://www.ferzkopp.net/Software/${pname}/${name}.tar.gz";
sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33";
};

buildInputs = [ SDL2 ]
Expand Down Expand Up @@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
homepage = https://sourceforge.net/projects/sdlgfx/;
license = licenses.zlib;

maintainers = with maintainers; [ bjg ];
maintainers = with maintainers; [ cpages ];
platforms = platforms.unix;
};
}
5 changes: 3 additions & 2 deletions pkgs/development/libraries/SDL2_image/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "SDL2_image-${version}";
version = "2.0.2";
version = "2.0.3";

src = fetchurl {
url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
sha256 = "1s3ciydixrgv34vlf45ak5syq5nlfaqf19wf162lbz4ixxd0gpvj";
sha256 = "0s13dmakn21q6yw8avl67d4zkxzl1wap6l5nwf6cvzrmlxfw441m";
};

buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]
Expand All @@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
homepage = http://www.libsdl.org/projects/SDL_image/;
platforms = platforms.unix;
license = licenses.zlib;
maintainers = with maintainers; [ cpages ];
};
}

0 comments on commit c8664a2

Please sign in to comment.