diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix new file mode 100644 index 000000000000..8c1706be5835 --- /dev/null +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, guile, buildEnv +, SDL, SDL_image, SDL_ttf, SDL_mixer +}: + +stdenv.mkDerivation rec { + name = "guile-sdl-0.5.1"; + + meta = with stdenv.lib; { + description = "Guile bindings for SDL"; + homepage = "http://gnu.org/s/guile-sdl"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "mirror://gnu/guile-sdl/${name}.tar.xz"; + sha256 = "126n4rd0ydh6i2s11ari5k85iivradlf12zq13b34shf9k1wn5am"; + }; + + nativeBuildInputs = [ guile ]; + + buildInputs = [ + SDL SDL_image SDL_ttf SDL_mixer + ]; + + GUILE_AUTO_COMPILE = 0; + + makeFlags = let + sdl = buildEnv { + name = "sdl-env"; + paths = buildInputs; + }; + in "SDLMINUSI=-I${sdl}/include/SDL"; +} diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 2ddad5cde677..83e959cc8c8c 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -7,11 +7,11 @@ else stdenv.mkDerivation) (rec { - name = "guile-2.0.9"; + name = "guile-2.0.11"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "0nw9y8vjyz4r61v06p9msks5lm58pd91irmzg4k487vmv743h2pp"; + sha256 = "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f"; }; nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7657927a45d6..6f8323399ad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4225,6 +4225,8 @@ let guile-opengl = callPackage ../development/guile-modules/guile-opengl { }; + guile-sdl = callPackage ../development/guile-modules/guile-sdl { }; + guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; pharo-vm = callPackage_i686 ../development/pharo/vm { };