From 222cedd14b4b7e879dc27c2b455943d0a0f1851d Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Wed, 1 Dec 2004 15:39:39 +0000 Subject: [PATCH] let's patch all our glibc thingies!! svn path=/nixpkgs/branches/nixos-pkgs/; revision=1826 --- pkgs/stdenv/nix-linux-static/default.nix | 1 + pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/nix-linux-static/default.nix b/pkgs/stdenv/nix-linux-static/default.nix index 305d9220685..7cbdf6e30ac 100644 --- a/pkgs/stdenv/nix-linux-static/default.nix +++ b/pkgs/stdenv/nix-linux-static/default.nix @@ -70,6 +70,7 @@ rec { url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/glibc-2.3.3-static-2.tar.gz; pkgname = "glibc"; patchelf = ./patchelf-static/patchelf; + find = findutils; postprocess = ./scripts/add-symlink.sh; extra = linuxHeaders; extra2 = coreutils; diff --git a/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh b/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh index 4241d237d9d..75805a900d3 100644 --- a/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh +++ b/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh @@ -1,4 +1,5 @@ $extra2/bin/chmod u+w $out/include (cd $out/include && $extra2/bin/ln -s $extra/include/* .) || exit 1 -$patchelf --interpreter $out/lib/ld-linux.so.2 * +cd $out +$findutils/bin/find . | $findutils/bin/xargs $patchelf --interpreter $out/lib/ld-linux.so.2 --shrink-rpath