public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more fixes

Browse Source 
svn path=/nixpkgs/branches/nixos-pkgs/; revision=1828
This commit is contained in:
Armijn Hemel 2004-12-01 16:09:21 +00:00
parent 3782c94ebb
commit 63b86ec696
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/stdenv/nix-linux-static/default.nix
View File

@ -11,7 +11,7 @@ rec {
args = [ ./scripts/curl-unpack ]; args = [ ./scripts/curl-unpack ];
}; };
download = {url, pkgname, postprocess ? null, extra ? null, extra2 ? null}: derivation { download = {url, pkgname, postprocess ? null, extra ? null, extra2 ? null, extra3 ? null}: derivation {
name = pkgname; name = pkgname;
builder = ./bash-static/bash; builder = ./bash-static/bash;
tar = ./gnutar-static/bin/tar; tar = ./gnutar-static/bin/tar;
@ -20,7 +20,7 @@ rec {
cp = ./tools/cp; cp = ./tools/cp;
system = "i686-linux"; system = "i686-linux";
args = [ ./scripts/download-script ]; args = [ ./scripts/download-script ];
inherit postprocess extra extra2; inherit postprocess extra extra2 extra3;
}; };
/* /*
@ -70,7 +70,7 @@ rec {
url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/glibc-2.3.3-static-2.tar.gz; url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/glibc-2.3.3-static-2.tar.gz;
pkgname = "glibc"; pkgname = "glibc";
patchelf = ./patchelf-static/patchelf; patchelf = ./patchelf-static/patchelf;
findutils = findutils; extra3 = findutils;
postprocess = ./scripts/add-symlink.sh; postprocess = ./scripts/add-symlink.sh;
extra = linuxHeaders; extra = linuxHeaders;
extra2 = coreutils; extra2 = coreutils;

2
pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh
View File

@ -2,4 +2,4 @@ $extra2/bin/chmod u+w $out/include
(cd $out/include && $extra2/bin/ln -s $extra/include/* .) || exit 1 (cd $out/include && $extra2/bin/ln -s $extra/include/* .) || exit 1
cd $out cd $out
$findutils/bin/find . | $findutils/bin/xargs $patchelf --interpreter $out/lib/ld-linux.so.2 --shrink-rpath $extra3/bin/find . | $extra3/bin/xargs $patchelf --interpreter $out/lib/ld-linux.so.2 --shrink-rpath