From 7983251ce0add8dbb12ff4c44d34d5d94cccafb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 20 Nov 2009 08:27:59 +0000 Subject: [PATCH] Fixing a trivial error in the glibc-2.11 longDescription, and fixing the 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 --- pkgs/development/libraries/glibc-2.11/default.nix | 2 +- pkgs/top-level/all-packages.nix | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc-2.11/default.nix b/pkgs/development/libraries/glibc-2.11/default.nix index d9b1d503a401..ad312123b3ae 100644 --- a/pkgs/development/libraries/glibc-2.11/default.nix +++ b/pkgs/development/libraries/glibc-2.11/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { longDescription = '' 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... The GNU C library is used as the C library in the GNU system and diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788e282a9983..c12b0418d89b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3425,6 +3425,14 @@ let 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; eglibc = import ../development/libraries/eglibc { @@ -4200,7 +4208,7 @@ let }; 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 # don't build for me in unicode. unicode = (system != "i686-cygwin" && ! (stdenv ? cross));