diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2004-12-01 16:09:21 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2004-12-01 16:09:21 +0000 |
| commit | 63b86ec696b1a1240cd85215c9890a9a574a90f6 (patch) | |
| tree | c83bf6cee707093bec6cb5e9ffdcf36c437e67b8 /pkgs/stdenv | |
| parent | 3782c94ebbadedd72b8e6689817efd659e9a183e (diff) | |
| download | nixpkgs-63b86ec696b1a1240cd85215c9890a9a574a90f6.tar nixpkgs-63b86ec696b1a1240cd85215c9890a9a574a90f6.tar.gz nixpkgs-63b86ec696b1a1240cd85215c9890a9a574a90f6.tar.bz2 nixpkgs-63b86ec696b1a1240cd85215c9890a9a574a90f6.tar.lz nixpkgs-63b86ec696b1a1240cd85215c9890a9a574a90f6.tar.xz nixpkgs-63b86ec696b1a1240cd85215c9890a9a574a90f6.tar.zst nixpkgs-63b86ec696b1a1240cd85215c9890a9a574a90f6.zip | |
more fixes
svn path=/nixpkgs/branches/nixos-pkgs/; revision=1828
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/nix-linux-static/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/nix-linux-static/default.nix b/pkgs/stdenv/nix-linux-static/default.nix index 562c79736cc..5bf544fa074 100644 --- a/pkgs/stdenv/nix-linux-static/default.nix +++ b/pkgs/stdenv/nix-linux-static/default.nix @@ -11,7 +11,7 @@ rec { 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; builder = ./bash-static/bash; tar = ./gnutar-static/bin/tar; @@ -20,7 +20,7 @@ rec { cp = ./tools/cp; system = "i686-linux"; 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; pkgname = "glibc"; patchelf = ./patchelf-static/patchelf; - findutils = findutils; + extra3 = 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 75805a900d3..24f32abea8d 100644 --- a/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh +++ b/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh @@ -2,4 +2,4 @@ $extra2/bin/chmod u+w $out/include (cd $out/include && $extra2/bin/ln -s $extra/include/* .) || exit 1 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 |