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

Updating gettext to that decided in nixpkgs trunk (0.17 to 0.18)

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22842
This commit is contained in:
Lluís Batlle i Rossell 2010-08-01 21:01:54 +00:00
parent 8c0e984f91
commit 5cc46602ce
3 changed files with 5 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
pkgs/development/libraries/gettext/0.18.nix
View File

@ -1,66 +0,0 @@
# XXX: Remove me when `stdenv-updates' is merged.
{ stdenv, fetchurl, libiconv }:
stdenv.mkDerivation (rec {
name = "gettext-0.18.1.1";
src = fetchurl {
url = "mirror://gnu/gettext/${name}.tar.gz";
sha256 = "1sa3ch12qxa4h3ya6hkz119yclcccmincl9j20dhrdx5mykp3b4k";
};
configureFlags = "--disable-csharp";
# On cross building, gettext supposes that the wchar.h from libc
# does not fulfill gettext needs, so it tries to work with its
# own wchar.h file, which does not cope well with the system's
# wchar.h and stddef.h (gcc-4.3 - glibc-2.9)
preConfigure = ''
if test -n "$crossConfig"; then
echo gl_cv_func_wcwidth_works=yes > cachefile
configureFlags="$configureFlags --cache-file=`pwd`/cachefile"
fi
'';
crossAttrs = {
buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv)
stdenv.gccCross.libc.libiconv.hostDrv;
};
meta = {
description = "GNU gettext, a well integrated set of translation tools and documentation";
longDescription = ''
Usually, programs are written and documented in English, and use
English at execution time for interacting with users. Using a common
language is quite handy for communication between developers,
maintainers and users from all countries. On the other hand, most
people are less comfortable with English than with their own native
language, and would rather be using their mother tongue for day to
day's work, as far as possible. Many would simply love seeing their
computer screen showing a lot less of English, and far more of their
own language.
GNU `gettext' is an important step for the GNU Translation Project, as
it is an asset on which we may build many other steps. This package
offers to programmers, translators, and even users, a well integrated
set of tools and documentation. Specifically, the GNU `gettext'
utilities are a set of tools that provides a framework to help other
GNU packages produce multi-lingual messages.
'';
homepage = http://www.gnu.org/software/gettext/;
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all;
};
}
//
(if (!stdenv.isLinux) # any non-GNU system
then {
buildInputs = [ libiconv ];
}
else {}))

6
pkgs/development/libraries/gettext/default.nix
View File

@ -1,11 +1,13 @@
# XXX: Remove me when `stdenv-updates' is merged.
{ stdenv, fetchurl, libiconv }:
stdenv.mkDerivation (rec {
name = "gettext-0.18";
name = "gettext-0.18.1.1";
src = fetchurl {
url = "mirror://gnu/gettext/${name}.tar.gz";
sha256 = "1rbgm6sxgq218pridn2vji5nlj3hdf4vs75rz00wc0wcw4fjqd02";
sha256 = "1sa3ch12qxa4h3ya6hkz119yclcccmincl9j20dhrdx5mykp3b4k";
};
configureFlags = "--disable-csharp";

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

@ -3890,14 +3890,7 @@ let
use_svn = stdenv.system == "x86_64-linux";
};
gettext_0_17 = import ../development/libraries/gettext {
inherit fetchurl stdenv libiconv;
};
gettext = gettext_0_18;
# XXX: Remove me when `stdenv-updates' is merged.
gettext_0_18 = import ../development/libraries/gettext/0.18.nix {
gettext = import ../development/libraries/gettext/default.nix {
inherit fetchurl stdenv libiconv;
};