From 00ec235e44abfefb2485f7302c0d8ee090d48c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Fri, 31 Oct 2014 23:50:54 +0800
Subject: [PATCH 1/2] guile-sdl: new package

---
 .../guile-modules/guile-sdl/default.nix       | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/guile-modules/guile-sdl/default.nix

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 00000000000..8c1706be583
--- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05c7b843b66..ae5da7b7e8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4199,6 +4199,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 { };

From 1e4e719ffba3cb90481eb71f29b48b197c50a2d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Sat, 1 Nov 2014 16:56:09 +0800
Subject: [PATCH 2/2] guile: 2.0.9 -> 2.0.11

---
 pkgs/development/interpreters/guile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 2ddad5cde67..83e959cc8c8 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 ];