diff options
author | Robin Gloster <mail@glob.in> | 2016-02-27 00:08:08 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-02-27 00:08:08 +0000 |
commit | 3477e662e60ba80a777f9126ba65ca6e9e0fcdf8 (patch) | |
tree | 26aa99e97f980701131668a00a24fcb85c5cd8a8 /pkgs/development/libraries/gettext | |
parent | b4dadff5429d0bf47bcdafff14dd3d0032039699 (diff) | |
parent | 766ad682f146a755b460dd87006912a96d915bcd (diff) |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/libraries/gettext')
-rw-r--r-- | pkgs/development/libraries/gettext/absolute-paths.diff | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gettext/default.nix | 35 | ||||
-rw-r--r-- | pkgs/development/libraries/gettext/expat.nix | 10 |
3 files changed, 20 insertions, 29 deletions
diff --git a/pkgs/development/libraries/gettext/absolute-paths.diff b/pkgs/development/libraries/gettext/absolute-paths.diff index 6d5cf1c1ba24d..af37f61a9a41d 100644 --- a/pkgs/development/libraries/gettext/absolute-paths.diff +++ b/pkgs/development/libraries/gettext/absolute-paths.diff @@ -7,7 +7,7 @@ index 1dfa3bb..d6ef8a8 100644 # result. eval_gettext () { - gettext "$1" | (export PATH `envsubst --variables "$1"`; envsubst "$1") -+ @out@/bin/gettext "$1" | (export PATH `envsubst --variables "$1"`; envsubst "$1") ++ @out@/bin/gettext "$1" | (export PATH `@out@/bin/envsubst --variables "$1"`; @out@/bin/envsubst "$1") } # eval_ngettext MSGID MSGID-PLURAL COUNT @@ -15,7 +15,7 @@ index 1dfa3bb..d6ef8a8 100644 # shell variables in the result. eval_ngettext () { - ngettext "$1" "$2" "$3" | (export PATH `envsubst --variables "$1 $2"`; envsubst "$1 $2") -+ @out@/bin/ngettext "$1" "$2" "$3" | (export PATH `envsubst --variables "$1 $2"`; envsubst "$1 $2") ++ @out@/bin/ngettext "$1" "$2" "$3" | (export PATH `@out@/bin/envsubst --variables "$1 $2"`; @out@/bin/envsubst "$1 $2") } # Note: This use of envsubst is much safer than using the shell built-in 'eval' diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 9962e75e2f9cf..9b24ccc79e82b 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 ]; @@ -18,20 +19,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 @@ -49,16 +50,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++"; @@ -88,8 +89,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; }; } @@ -106,4 +107,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 fc6116b391609..0000000000000 --- 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 -'' |