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

Fixing a trivial error in the glibc-2.11 longDescription, and fixing the

Browse Source 
arguments for the ncurses expression.

We should find a way to express a dependency in cross compilation of the style
"cross-ncurses depends on having the native-ncurses".



svn path=/nixpkgs/branches/stdenv-updates/; revision=18479
This commit is contained in:
Lluís Batlle i Rossell 2009-11-20 08:27:59 +00:00
parent e1af625517
commit 7983251ce0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/glibc-2.11/default.nix
View File

@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
longDescription = longDescription =
'' Any Unix-like operating system needs a C library: the library which '' Any Unix-like operating system needs a C library: the library which
defines the ``system calls'' and other basic facilities such as defines the "system calls" and other basic facilities such as
open, malloc, printf, exit... open, malloc, printf, exit...
The GNU C library is used as the C library in the GNU system and The GNU C library is used as the C library in the GNU system and

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

@ -3425,6 +3425,14 @@ let
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}; };
glibc211Cross = cross : makeOverridable (import ../development/libraries/glibc-2.11) {
inherit stdenv fetchurl cross;
binutilsCross = binutilsCross cross;
gccCross = gccCrossStageStatic cross;
kernelHeaders = kernelHeadersCross cross;
installLocales = getPkgConfig "glibc" "locales" false;
};
glibcCross = cross: glibc29Cross cross; glibcCross = cross: glibc29Cross cross;
eglibc = import ../development/libraries/eglibc { eglibc = import ../development/libraries/eglibc {
@ -4200,7 +4208,7 @@ let
}; };
ncurses = makeOverridable (composedArgsAndFun (import ../development/libraries/ncurses)) { ncurses = makeOverridable (composedArgsAndFun (import ../development/libraries/ncurses)) {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv;
# The "! (stdenv ? cross)" is for the cross-built arm ncurses, which # The "! (stdenv ? cross)" is for the cross-built arm ncurses, which
# don't build for me in unicode. # don't build for me in unicode.
unicode = (system != "i686-cygwin" && ! (stdenv ? cross)); unicode = (system != "i686-cygwin" && ! (stdenv ? cross));