From 16d701c9abc64f084888ab4edbda5143f7c82ce2 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 31 Oct 2007 12:17:14 +0000
Subject: [PATCH] rxvt-unicode and jdk update provided by Tobias Hammerschmidt

svn path=/nixpkgs/trunk/; revision=9561
---
 pkgs/applications/misc/rxvt_unicode/default.nix | 15 +++++++++++++++
 pkgs/development/compilers/jdk/jdk6-linux.nix   | 12 ++++++------
 pkgs/top-level/all-packages.nix                 |  6 ++++++
 3 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/misc/rxvt_unicode/default.nix

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
new file mode 100644
index 00000000000..b43b3c275e8
--- /dev/null
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -0,0 +1,15 @@
+args: with args; stdenv.mkDerivation {
+  name = "rxvt-unicode-8.4";
+
+  buildInputs = [ libX11 libXt libXft perl ];
+
+  src = fetchurl {
+    url = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-8.4.tar.bz2;
+    sha256 = "ff8d904a815151edde72bb3e51d1561125813569cb3d487cbac428ec23facdbb";
+  };
+
+  meta = {
+    description = "rxvt-unicode is a clone of the well known terminal emulator rxvt.";
+    homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
+  };
+}
diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix
index 63e4de70b48..17a23c981e0 100644
--- a/pkgs/development/compilers/jdk/jdk6-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk6-linux.nix
@@ -14,18 +14,18 @@ assert pluginSupport -> libstdcpp5 != null;
 
 (stdenv.mkDerivation ({
   name =
-    if installjdk then "jdk-1.6.0" else "jre-1.6.0";
+    if installjdk then "jdk-1.6.0_3" else "jre-1.6.0_3";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = http://download.java.net/dlj/binaries/jdk-6-dlj-linux-i586.bin;
-        sha256 = "0rw48124fdc5rhafj6qzrysb4w823jbn3awxgn07kcy1nvnrhkqw";
+        url = http://download.java.net/dlj/binaries/jdk-6u3-dlj-linux-i586.bin;
+        sha256 = "5c44208fbd5f90b3e6a0692ed9e1e98f5feb0c88aa0cfae5186dddb1f05f731b";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = http://download.java.net/dlj/binaries/jdk-6-dlj-linux-amd64.bin;
-        sha256 = "1hr16f5kr3xcyhkl3yc2qi2kxg2avr3cmlxv4awpnj0930rmvwzi";
+        url = http://download.java.net/dlj/binaries/jdk-6u3-dlj-linux-amd64.bin;
+        sha256 = "8bc80ea1bf739674c1cacdfba9987a4d15adb54f4b1462a0b48b79815f56b311";
       }
     else
       abort "jdk requires i686-linux or x86_64 linux";
@@ -83,4 +83,4 @@ assert pluginSupport -> libstdcpp5 != null;
     else
       {}
   )
-)
\ No newline at end of file
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab841177faf..ae988f88337 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3897,6 +3897,12 @@ rec {
     inherit (xlibs) libXt libX11;
   };
 
+  # = urxvt
+  rxvt_unicode = import ../applications/misc/rxvt_unicode {
+    inherit lib fetchurl stdenv perl;
+    inherit (xlibs) libXt libX11 libXft;
+  };
+
   sbagen = import ../applications/misc/sbagen {
     inherit fetchurl stdenv;
   };