From 031c022a252b659c5e21da9786e148b192cec6db Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 28 May 2008 14:33:49 +0000 Subject: * Fix a regression in klibcShrunk. svn path=/nixpkgs/trunk/; revision=11920 --- pkgs/os-specific/linux/klibc/shrunk.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/klibc') diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix index f45067565ab..ff72d1f72b8 100644 --- a/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/pkgs/os-specific/linux/klibc/shrunk.nix @@ -1,7 +1,11 @@ {stdenv, klibc}: stdenv.mkDerivation { - name = "${klibc.name}-shrunk"; + # !!! For now, the name has to be exactly as long as the original + # name due to the sed hackery below. Once patchelf 0.4 is in the + # tree, we can do this properly. + #name = "${klibc.name}-shrunk"; + name = "${klibc.name}"; buildCommand = '' ensureDir $out/lib cp -prd ${klibc}/lib/klibc/bin $out/ @@ -13,7 +17,7 @@ stdenv.mkDerivation { echo $i sed "s^$old^$new^" -i $i # !!! use patchelf - #patchelf --set-rpath /foo/bar $i + #patchelf --set-interpreter $new $i done ''; # */ allowedReferences = ["out"]; -- cgit 1.4.1