diff --git a/pkgs/stdenv/nix-linux-static/default.nix b/pkgs/stdenv/nix-linux-static/default.nix index 703131da1db..305d9220685 100644 --- a/pkgs/stdenv/nix-linux-static/default.nix +++ b/pkgs/stdenv/nix-linux-static/default.nix @@ -23,6 +23,8 @@ rec { inherit postprocess extra extra2; }; +/* + glibc = derivation { name = "glibc"; builder = ./bash-static/bash; @@ -37,6 +39,8 @@ rec { args = [ ./scripts/glibc-build ]; }; +*/ + coreutils = download {url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/coreutils-5.0-static.tar.gz; pkgname = "coreutils";}; bzip2 = download {url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/bzip2-1.0.2-static.tar.gz; pkgname = "bzip2";}; @@ -62,15 +66,14 @@ rec { linuxHeaders = download {url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/linux-headers-2.4.25-i386.tar.gz; pkgname = "linux-headers";}; -/* glibc = download { url = http://losser.st-lab.cs.uu.nl/~armijn/.nix/glibc-2.3.3-static-2.tar.gz; pkgname = "glibc"; + patchelf = ./patchelf-static/patchelf; postprocess = ./scripts/add-symlink.sh; extra = linuxHeaders; extra2 = coreutils; }; -*/ stdenvInitial = let { diff --git a/pkgs/stdenv/nix-linux-static/patchelf-static/patchelf b/pkgs/stdenv/nix-linux-static/patchelf-static/patchelf new file mode 100755 index 00000000000..d0ac6a22f61 Binary files /dev/null and b/pkgs/stdenv/nix-linux-static/patchelf-static/patchelf differ diff --git a/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh b/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh index e6a8f7cfc11..4241d237d9d 100644 --- a/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh +++ b/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh @@ -1,2 +1,4 @@ $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 *