enable slang here...

svn path=/nixpkgs/trunk/; revision=4439
This commit is contained in:
Armijn Hemel 2005-12-26 15:56:00 +00:00
parent b43c421658
commit 4213f2ac08

View File

@ -311,9 +311,9 @@ rec {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };
#bashDiet = (import ../shells/bash-diet) { bashDiet = (import ../shells/bash-diet) {
# inherit fetchurl stdenv dietgcc; inherit fetchurl stdenv dietgcc;
#}; };
### DEVELOPMENT ### DEVELOPMENT
@ -467,7 +467,9 @@ rec {
inherit stdenv dietlibc; inherit stdenv dietlibc;
gcc = stdenv.gcc; gcc = stdenv.gcc;
}; };
inherit (stdenv.gcc) binutils glibc; #inherit (stdenv.gcc) binutils glibc;
inherit (stdenv.gcc) binutils;
glibc = dietlibc;
inherit stdenv; inherit stdenv;
}; };
@ -887,6 +889,10 @@ rec {
inherit fetchurl stdenv gettext; inherit fetchurl stdenv gettext;
}; };
slang = (import ../development/libraries/slang) {
inherit fetchurl stdenv pcre libpng;
};
cairo = (import ../development/libraries/cairo) { cairo = (import ../development/libraries/cairo) {
inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng; inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
}; };
@ -1978,6 +1984,12 @@ rec {
x11Support = false; x11Support = false;
}; };
nixStatic = (import ../misc/nix-static) {
inherit fetchurl stdenv aterm perl;
curl = bootCurl; /* !!! ugly */
bdb = db4;
};
nix = (import ../misc/nix) { nix = (import ../misc/nix) {
inherit fetchurl stdenv aterm perl; inherit fetchurl stdenv aterm perl;
curl = bootCurl; /* !!! ugly */ curl = bootCurl; /* !!! ugly */