From bb7c8d72edd22abd532885da22d336a7c6bcfb2d Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Fri, 14 Jan 2005 11:41:26 +0000
Subject: [PATCH] move patchelf in a directory, so it can play nice along with
 things like initialPath

svn path=/nixpkgs/branches/nixos-pkgs/; revision=2020
---
 pkgs/stdenv/nix-linux-static/default.nix            |   6 +++++-
 .../patchelf-static/{ => bin}/patchelf              | Bin
 2 files changed, 5 insertions(+), 1 deletion(-)
 rename pkgs/stdenv/nix-linux-static/patchelf-static/{ => bin}/patchelf (100%)

diff --git a/pkgs/stdenv/nix-linux-static/default.nix b/pkgs/stdenv/nix-linux-static/default.nix
index 7bc1cec1099d..e8c6a93a27c4 100644
--- a/pkgs/stdenv/nix-linux-static/default.nix
+++ b/pkgs/stdenv/nix-linux-static/default.nix
@@ -43,6 +43,8 @@ rec {
 
   coreutils = download {url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/coreutils-5.0-static.tar.gz; pkgname = "coreutils";};
 
+  patchelf = ./patchelf-static/bin/patchelf;
+
   bzip2 = download {url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/bzip2-1.0.2-static.tar.gz; pkgname = "bzip2";};
 
   gnumake = download {url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/make-3.80-static.tar.gz; pkgname = "gnumake";};
@@ -69,7 +71,7 @@ rec {
   glibc = download {
     url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/glibc-2.3.3-static-2.tar.gz;
     pkgname = "glibc";
-    patchelf = ./patchelf-static/patchelf;
+    patchelf = ./patchelf-static/bin/patchelf;
     extra3 = findutils;
     extra4 = gnused;
     postprocess = ./scripts/add-symlink.sh;
@@ -100,6 +102,7 @@ rec {
 
   stdenvBootFun = {glibc, gcc, binutils}: (import ../generic) {
     name = "stdenv-linux-static-boot";
+    preHook = ./prehook.sh;
     stdenv = stdenvInitial;
     shell = ./bash-static/bash;
     gcc = (import ../../build-support/gcc-wrapper) {
@@ -120,6 +123,7 @@ rec {
       findutils
       diffutils
       patch
+      ./patchelf-static
     ];
   };
 
diff --git a/pkgs/stdenv/nix-linux-static/patchelf-static/patchelf b/pkgs/stdenv/nix-linux-static/patchelf-static/bin/patchelf
similarity index 100%
rename from pkgs/stdenv/nix-linux-static/patchelf-static/patchelf
rename to pkgs/stdenv/nix-linux-static/patchelf-static/bin/patchelf