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

* Remove dietgcc, use useDietLibC.

Browse Source 
* glibc -> libc in some places.

svn path=/nixpkgs/trunk/; revision=6877
This commit is contained in:
Eelco Dolstra 2006-10-27 13:52:37 +00:00
parent 01fbf62a2c
commit d29fe5bfc1
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/top-level/all-packages.nix
View File

@ -452,11 +452,6 @@ rec {
inherit fetchurl stdenv gettext; inherit fetchurl stdenv gettext;
}; };
wgetDiet = import ../tools/networking/wget {
inherit fetchurl gettext;
stdenv = overrideGCC stdenv dietgcc;
};
which = import ../tools/system/which { which = import ../tools/system/which {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -535,16 +530,6 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
dietgcc = import ../build-support/gcc-wrapper {
nativeTools = false;
nativeLibc = false;
gcc = gcc34;
#inherit (stdenv.gcc) binutils glibc;
inherit (gcc34) binutils;
glibc = dietlibc;
inherit stdenv;
};
dylan = import ../development/compilers/gwydion-dylan { dylan = import ../development/compilers/gwydion-dylan {
inherit fetchurl stdenv perl boehmgc yacc flex readline; inherit fetchurl stdenv perl boehmgc yacc flex readline;
dylan = dylan =
@ -562,7 +547,7 @@ rec {
langF77 = true; langF77 = true;
langCC = false; langCC = false;
}; };
inherit (stdenv.gcc) binutils glibc; inherit (stdenv.gcc) binutils libc;
inherit stdenv; inherit stdenv;
}; };
@ -597,7 +582,7 @@ rec {
kernelHeadersCross = kernelHeadersArm; kernelHeadersCross = kernelHeadersArm;
cross = "arm-linux"; cross = "arm-linux";
}; };
inherit (stdenv.gcc) glibc; inherit (stdenv.gcc) libc;
binutils = binutilsArm; binutils = binutilsArm;
inherit stdenv; inherit stdenv;
}; };
@ -607,8 +592,8 @@ rec {
nativeLibc = false; nativeLibc = false;
cross = "mips-linux"; cross = "mips-linux";
gcc = gcc40mipsboot; gcc = gcc40mipsboot;
#inherit (stdenv.gcc) glibc; #inherit (stdenv.gcc) libc;
glibc = uclibcMips; libc = uclibcMips;
binutils = binutilsMips; binutils = binutilsMips;
inherit stdenv; inherit stdenv;
}; };
@ -634,7 +619,7 @@ rec {
kernelHeadersCross = kernelHeadersSparc; kernelHeadersCross = kernelHeadersSparc;
cross = "sparc-linux"; cross = "sparc-linux";
}; };
inherit (stdenv.gcc) glibc; inherit (stdenv.gcc) libc;
binutils = binutilsSparc; binutils = binutilsSparc;
inherit stdenv; inherit stdenv;
}; };
@ -722,7 +707,7 @@ rec {
langC = false; langC = false;
langF77 = false; langF77 = false;
}; };
inherit (stdenv.gcc) binutils glibc; inherit (stdenv.gcc) binutils libc;
inherit stdenv; inherit stdenv;
}; };
*/ */
@ -1502,7 +1487,7 @@ rec {
ncursesDiet = import ../development/libraries/ncurses-diet { ncursesDiet = import ../development/libraries/ncurses-diet {
inherit fetchurl; inherit fetchurl;
stdenv = overrideGCC stdenv dietgcc; stdenv = useDietLibC stdenv;
}; };
neon = import ../development/libraries/neon { neon = import ../development/libraries/neon {
@ -2035,7 +2020,7 @@ rec {
e2fsprogsDiet = import ../os-specific/linux/e2fsprogs-diet { e2fsprogsDiet = import ../os-specific/linux/e2fsprogs-diet {
inherit fetchurl gettext; inherit fetchurl gettext;
stdenv = overrideGCC stdenv dietgcc; stdenv = useDietLibC stdenv;
}; };
eject = import ../os-specific/linux/eject { eject = import ../os-specific/linux/eject {
@ -2061,7 +2046,7 @@ rec {
iputils = import ../os-specific/linux/iputils { iputils = import ../os-specific/linux/iputils {
inherit fetchurl stdenv kernelHeaders; inherit fetchurl stdenv kernelHeaders;
glibc = stdenv.gcc.glibc; glibc = stdenv.gcc.libc;
}; };
kernel = import ../os-specific/linux/kernel { kernel = import ../os-specific/linux/kernel {
@ -2491,7 +2476,7 @@ rec {
nanoDiet = import ../applications/editors/nano { nanoDiet = import ../applications/editors/nano {
inherit fetchurl gettext; inherit fetchurl gettext;
ncurses = ncursesDiet; ncurses = ncursesDiet;
stdenv = overrideGCC stdenv dietgcc; stdenv = useDietLibC stdenv;
}; };
nedit = import ../applications/editors/nedit { nedit = import ../applications/editors/nedit {
@ -2611,7 +2596,7 @@ rec {
vimDiet = import ../applications/editors/vim-diet { vimDiet = import ../applications/editors/vim-diet {
inherit fetchurl; inherit fetchurl;
ncurses = ncursesDiet; ncurses = ncursesDiet;
stdenv = overrideGCC stdenv dietgcc; stdenv = useDietLibC stdenv;
}; };
vlc = import ../applications/video/vlc { vlc = import ../applications/video/vlc {