From 401543289cb5df78a53dac3ffe99a405cfaaefdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 20 Feb 2008 09:02:00 +0000
Subject: [PATCH] GNU Guile 1.8.4.

svn path=/nixpkgs/trunk/; revision=10764
---
 .../interpreters/guile/default.nix            | 21 ++++++++++++-------
 .../interpreters/guile/snarf-tmpdir.patch     | 16 --------------
 2 files changed, 14 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/development/interpreters/guile/snarf-tmpdir.patch

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index edac3bf6effc..9aaa796d6b2e 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,12 +1,11 @@
 args: with args; 
-stdenv.mkDerivation {
-  name = "guile-1.8.3";
-  src = fetchurl {
-		url = ftp://ftp.gnu.org/gnu/guile/guile-1.8.3.tar.gz;
-		sha256 = "2ab59099cf2d46f57cf5421c9b84aa85f61961640046e8066c6b321257517796";
-	};
 
-  patches = [ ./snarf-tmpdir.patch ];
+stdenv.mkDerivation rec {
+  name = "guile-1.8.4";
+  src = fetchurl {
+    url = "ftp://ftp.gnu.org/gnu/guile/" + name + ".tar.gz";
+    sha256 = "1cz1d4n6vzw0lfsvplsiarwqk675f12j596dzfv0h5r9cljpc0ya";
+  };
 
   buildInputs = [ makeWrapper ];
   propagatedBuildInputs = [readline libtool gmp gawk];
@@ -16,4 +15,12 @@ stdenv.mkDerivation {
   '';
 
   setupHook = ./setup-hook.sh;
+
+  meta = {
+    description = ''GNU Guile is an interpreter for the Scheme
+                    programming language, packaged as a library that
+		    can be embedded into programs to make them extensible.'';
+    homepage = http://www.gnu.org/software/guile/;
+    license = "LGPL";
+  };
 }
diff --git a/pkgs/development/interpreters/guile/snarf-tmpdir.patch b/pkgs/development/interpreters/guile/snarf-tmpdir.patch
deleted file mode 100644
index 1c7f157227be..000000000000
--- a/pkgs/development/interpreters/guile/snarf-tmpdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- guile-1.8.3/libguile/guile-snarf.in	2008-02-12 10:32:48.000000000 +0100
-+++ guile-1.8.3/libguile/guile-snarf.in	2008-02-12 11:01:53.000000000 +0100
-@@ -69,9 +69,12 @@ fi
- 
- # set vars and handler -- handle CPP override
- cpp_ok_p=false
--tempdir="/tmp/snarf.$$"
-+
-+if [ x"$TMPDIR" = x ]; then TMPDIR="/tmp" ; else : ; fi
-+tempdir="$TMPDIR/guile-snarf.$$"
- (umask 077 && mkdir $tempdir) || exit 1
- temp="$tempdir/tmp"
-+
- if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ; fi
- 
- trap "rm -rf $tempdir" 0 1 2 15