From 5b6b8d3e3e1a09ead93a60007c301bdd290f3f44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Feb 2005 14:15:33 +0000
Subject: [PATCH] * Use the latest patchelf.  This fixes broken gconv modules
 (e.g.,   $glibc/lib/gconv/ISO-2022-JP.so has an RPATH of `$ORIGIN' so that it
   can find glibc/lib/gconv/libJIS.so; `$ORIGIN' should not be filtered   out
 of the RPATH).

svn path=/nixpkgs/trunk/; revision=2290
---
 pkgs/development/tools/misc/patchelf/default.nix | 7 +++----
 pkgs/stdenv/linux/default.nix                    | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 5a8b220f634..26f0888de63 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -1,10 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "patchelf-0.1pre1513";
+  name = "patchelf-0.1pre2286";
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/patchelf-0.1pre1513.tar.gz;
-    md5 = "874928f46117828c1d8019986aa2eaac";
+    url = http://catamaran.labs.cs.uu.nl/dist/nix/patchelf-0.1pre2286/patchelf-0.1pre2286.tar.gz;
+    md5 = "2b1377e6745c239255b3f4a6ba6c0c87";
   };
-#  src = /home/eelco/Dev/patchelf/patchelf-0.1.tar.gz;
 }
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 4b3790664c2..34d678c2fc0 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -64,7 +64,7 @@ rec {
   staticTools = downloadAndUnpack {
     url = http://catamaran.labs.cs.uu.nl/dist/tarballs/stdenv-linux/static-tools.tar.bz2;
     pkgname = "static-tools";
-    md5 = "9419d3dcccbe1af10d9d0d7d54269785";
+    md5 = "90578c603079313123e8c754a85e40d7";
   };
 
   binutils = downloadAndUnpack {