diff options
author | zimbatm <zimbatm@zimbatm.com> | 2016-02-21 13:22:44 +0000 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2016-02-22 22:47:45 +0000 |
commit | f05bc0444aac0fe5643254a07b15e7141b5e3146 (patch) | |
tree | 1f67cd1f1b74d546b67df1b2dabeeafdfb3465ad /pkgs/development/libraries/gettext | |
parent | 05d4959251f48ab37a6cc94e99d413efafe60d2a (diff) | |
download | nixpkgs-f05bc0444aac0fe5643254a07b15e7141b5e3146.tar nixpkgs-f05bc0444aac0fe5643254a07b15e7141b5e3146.tar.gz nixpkgs-f05bc0444aac0fe5643254a07b15e7141b5e3146.tar.bz2 nixpkgs-f05bc0444aac0fe5643254a07b15e7141b5e3146.tar.lz nixpkgs-f05bc0444aac0fe5643254a07b15e7141b5e3146.tar.xz nixpkgs-f05bc0444aac0fe5643254a07b15e7141b5e3146.tar.zst nixpkgs-f05bc0444aac0fe5643254a07b15e7141b5e3146.zip |
gettext: 0.19.6 -> 0.19.7
expat is replaced by a bundled version of libxml2
Diffstat (limited to 'pkgs/development/libraries/gettext')
-rw-r--r-- | pkgs/development/libraries/gettext/default.nix | 35 | ||||
-rw-r--r-- | pkgs/development/libraries/gettext/expat.nix | 10 |
2 files changed, 18 insertions, 27 deletions
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 1443626124e..c96d241ee90 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, libiconv, xz }: +{ stdenv, lib, fetchurl, libiconv, xz }: -stdenv.mkDerivation (rec { - name = "gettext-0.19.6"; +stdenv.mkDerivation rec { + name = "gettext-${version}"; + version = "0.19.7"; src = fetchurl { url = "mirror://gnu/gettext/${name}.tar.gz"; - sha256 = "0pb9vp4ifymvdmc31ks3xxcnfqgzj8shll39czmk8c1splclqjzd"; + sha256 = "0gy2b2aydj8r0sapadnjw8cmb8j2rynj28d5qs1mfa800njd51jk"; }; patches = [ ./absolute-paths.diff ]; @@ -14,20 +15,20 @@ stdenv.mkDerivation (rec { LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else ""; configureFlags = [ "--disable-csharp" "--with-xz" ] - ++ (stdenv.lib.optionals stdenv.isCygwin - [ "--disable-java" + ++ lib.optionals stdenv.isCygwin [ + "--disable-java" "--disable-native-java" # Share the cache among the various `configure' runs. "--config-cache" "--with-included-gettext" "--with-included-glib" "--with-included-libcroco" - ]) + ] # avoid retaining reference to CF during stdenv bootstrap - ++ (stdenv.lib.optionals stdenv.isDarwin [ - "gt_cv_func_CFPreferencesCopyAppValue=no" - "gt_cv_func_CFLocaleCopyCurrent=no" - ]); + ++ lib.optionals stdenv.isDarwin [ + "gt_cv_func_CFPreferencesCopyAppValue=no" + "gt_cv_func_CFLocaleCopyCurrent=no" + ]; postPatch = '' substituteAllInPlace gettext-runtime/src/gettext.sh.in @@ -45,16 +46,16 @@ stdenv.mkDerivation (rec { echo gl_cv_func_wcwidth_works=yes > cachefile configureFlags="$configureFlags --cache-file=`pwd`/cachefile" fi - '' + stdenv.lib.optionalString stdenv.isCygwin '' + '' + lib.optionalString stdenv.isCygwin '' sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in ''; - buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = [ xz ] ++ lib.optional (!stdenv.isLinux) libiconv; enableParallelBuilding = true; crossAttrs = { - buildInputs = stdenv.lib.optional (stdenv ? ccCross && stdenv.ccCross.libc ? libiconv) + buildInputs = lib.optional (stdenv ? ccCross && stdenv.ccCross.libc ? libiconv) stdenv.ccCross.libc.libiconv.crossDrv; # Gettext fails to guess the cross compiler configureFlags = "CXX=${stdenv.cross.config}-g++"; @@ -84,8 +85,8 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/gettext/; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + maintainers = with lib.maintainers; [ zimbatm ]; + platforms = lib.platforms.all; }; } @@ -102,4 +103,4 @@ stdenv.mkDerivation (rec { sed -i gettext-tools/gnulib-lib/Makefile.in \ -e 's/am_libgettextlib_la_OBJECTS =/am_libgettextlib_la_OBJECTS = error.lo/g' ''; -}) +} diff --git a/pkgs/development/libraries/gettext/expat.nix b/pkgs/development/libraries/gettext/expat.nix deleted file mode 100644 index fc6116b3916..00000000000 --- a/pkgs/development/libraries/gettext/expat.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ runCommand, gettext, expat, makeWrapper }: - -runCommand "gettext-expat-${gettext.name}" { buildInputs = [ makeWrapper ]; } '' - mkdir $out - cp -rf ${gettext}/* $out/ - chmod a+w $out/bin - for p in $out/bin/*; do - wrapProgram $p --prefix LD_LIBRARY_PATH : ${expat}/lib - done -'' |