From 9cfda380c8f0435304623ff806d11a3456ea4ac8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Oct 2006 11:50:08 +0000
Subject: [PATCH] * Add a statically linked patchelf.

svn path=/nixpkgs/trunk/; revision=6788
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 5 +++++
 pkgs/stdenv/linux/make-bootstrap-tools.sh  | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 84eb210c0a6..becd6c2d68b 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -25,6 +25,11 @@ let
   
     curl = pkgsDiet.realCurl;
 
+    patchelf = import ../../development/tools/misc/patchelf/new.nix {
+      inherit (pkgs) fetchurl;
+      stdenv = pkgs.makeStaticBinaries pkgs.stdenv;
+    };
+
     # The result should not contain any references (store paths) so
     # that we can safely copy them out of the store and to other
     # locations in the store.
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.sh b/pkgs/stdenv/linux/make-bootstrap-tools.sh
index 08732746b0b..fc531d8e2c6 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.sh
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.sh
@@ -43,10 +43,12 @@ cp $gnutar/bin/* tools/bin
 cp $gunzip/bin/gunzip tools/bin
 cp $bzip2/bin/bunzip2 tools/bin
 cp $patch/bin/* tools/bin
+cp $patchelf/bin/* tools/bin
 
 nukeRefs tools/bin/sed
 nukeRefs tools/bin/tar
 nukeRefs tools/bin/grep
+nukeRefs tools/bin/patchelf
 
 #cp $patchelf/bin/* tools/bin