summary refs log tree commit diff
path: root/pkgs/os-specific/linux/klibc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-05-28 14:33:49 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-05-28 14:33:49 +0000
commit031c022a252b659c5e21da9786e148b192cec6db (patch)
tree777af37d85a396500619d0f34e10652a1cef26f5 /pkgs/os-specific/linux/klibc
parent6fe2f27877b4e077f9394c746446d2313b7486ef (diff)
downloadnixpkgs-031c022a252b659c5e21da9786e148b192cec6db.tar
nixpkgs-031c022a252b659c5e21da9786e148b192cec6db.tar.gz
nixpkgs-031c022a252b659c5e21da9786e148b192cec6db.tar.bz2
nixpkgs-031c022a252b659c5e21da9786e148b192cec6db.tar.lz
nixpkgs-031c022a252b659c5e21da9786e148b192cec6db.tar.xz
nixpkgs-031c022a252b659c5e21da9786e148b192cec6db.tar.zst
nixpkgs-031c022a252b659c5e21da9786e148b192cec6db.zip
* Fix a regression in klibcShrunk.
svn path=/nixpkgs/trunk/; revision=11920
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
-rw-r--r--pkgs/os-specific/linux/klibc/shrunk.nix8
1 files changed, 6 insertions, 2 deletions
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"];