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

* Cleanup.

Browse Source 
svn path=/nixpkgs/trunk/; revision=6811
This commit is contained in:
Eelco Dolstra 2006-10-23 20:20:25 +00:00
parent 4db491be54
commit 87e86fb538
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -2,16 +2,24 @@ let
pkgs = import ../../top-level/all-packages.nix {}; pkgs = import ../../top-level/all-packages.nix {};
# Have to do removeAttrs to prevent all-packages from copying
# stdenv-linux's dependencies, rather than building new ones with
# dietlibc.
pkgsToRemove =
[ "binutils" "gcc" "coreutils" "findutils" "diffutils" "gnused" "gnugrep"
"gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf"
];
pkgsDiet = import ../../top-level/all-packages.nix { pkgsDiet = import ../../top-level/all-packages.nix {
# Have to do removeAttrs to prevent all-packages from copying bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv) pkgsToRemove;
# stdenv-linux's dependencies, rather than building new ones with
# dietlibc.
bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv)
[ "binutils" "gcc" "coreutils" "findutils" "diffutils" "gnused" "gnugrep"
"gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf"
];
}; };
pkgsStatic = import ../../top-level/all-packages.nix {
bootStdenv = removeAttrs (pkgs.makeStaticBinaries pkgs.stdenv) pkgsToRemove;
};
generator = pkgs.stdenv.mkDerivation { generator = pkgs.stdenv.mkDerivation {
name = "bootstrap-tools-generator"; name = "bootstrap-tools-generator";
builder = ./make-bootstrap-tools.sh; builder = ./make-bootstrap-tools.sh;
@ -19,16 +27,19 @@ let
inherit (pkgsDiet) inherit (pkgsDiet)
coreutils findutils diffutils gnugrep coreutils findutils diffutils gnugrep
gnutar gzip bzip2 gnumake bash patch; gnutar gzip bzip2 gnumake bash patch;
gnused = pkgsDiet.gnused412; # 4.1.5 gives "Memory exhausted" errors gnused = pkgsDiet.gnused412; # 4.1.5 gives "Memory exhausted" errors
gawk =
# patchelf is C++, won't work with dietlibc.
inherit (pkgsStatic) patchelf;
gawk =
# Dietlibc only provides sufficient math functions (fmod, sin, # Dietlibc only provides sufficient math functions (fmod, sin,
# cos, etc.) on i686. On other platforms, use Glibc. # cos, etc.) on i686. On other platforms, use Glibc.
if pkgs.stdenv.system == "i686-linux" if pkgs.stdenv.system == "i686-linux"
then pkgsDiet.gawk then pkgsDiet.gawk
else import ../../tools/text/gawk { else pkgsStatic.gawk;
inherit (pkgs) fetchurl;
stdenv = pkgs.makeStaticBinaries pkgs.stdenv;
};
binutils = pkgsDiet.binutils217; binutils = pkgsDiet.binutils217;
gcc = import ../../development/compilers/gcc-static-4.1 { gcc = import ../../development/compilers/gcc-static-4.1 {
@ -39,11 +50,6 @@ let
curl = pkgsDiet.realCurl; curl = pkgsDiet.realCurl;
patchelf = import ../../development/tools/misc/patchelf/new.nix {
inherit (pkgs) fetchurl;
stdenv = pkgs.makeStaticBinaries pkgs.stdenv;
};
glibc = pkgs.glibc; glibc = pkgs.glibc;
# The result should not contain any references (store paths) so # The result should not contain any references (store paths) so