diff options
author | Robin Gloster <mail@glob.in> | 2016-02-19 21:16:14 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-02-19 21:16:14 +0000 |
commit | bc21db36925af6b79b070d6259c942b5b51239de (patch) | |
tree | 5489c46ac6a1f101cff9e9b46febcf7bead80404 /pkgs/development/libraries/gettext/absolute-paths.diff | |
parent | ea84b3a915987edea0fca8545b0136867da16844 (diff) | |
parent | 5ea21d69f5312db17f9a9d98e439ad1f22d80f73 (diff) | |
download | nixpkgs-bc21db36925af6b79b070d6259c942b5b51239de.tar nixpkgs-bc21db36925af6b79b070d6259c942b5b51239de.tar.gz nixpkgs-bc21db36925af6b79b070d6259c942b5b51239de.tar.bz2 nixpkgs-bc21db36925af6b79b070d6259c942b5b51239de.tar.lz nixpkgs-bc21db36925af6b79b070d6259c942b5b51239de.tar.xz nixpkgs-bc21db36925af6b79b070d6259c942b5b51239de.tar.zst nixpkgs-bc21db36925af6b79b070d6259c942b5b51239de.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/libraries/gettext/absolute-paths.diff')
-rw-r--r-- | pkgs/development/libraries/gettext/absolute-paths.diff | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gettext/absolute-paths.diff b/pkgs/development/libraries/gettext/absolute-paths.diff new file mode 100644 index 00000000000..6d5cf1c1ba2 --- /dev/null +++ b/pkgs/development/libraries/gettext/absolute-paths.diff @@ -0,0 +1,21 @@ +diff --git a/gettext-runtime/src/gettext.sh.in b/gettext-runtime/src/gettext.sh.in +index 1dfa3bb..d6ef8a8 100644 +--- a/gettext-runtime/src/gettext.sh.in ++++ b/gettext-runtime/src/gettext.sh.in +@@ -86,14 +86,14 @@ fi + # looks up the translation of MSGID and substitutes shell variables in the + # result. + eval_gettext () { +- gettext "$1" | (export PATH `envsubst --variables "$1"`; envsubst "$1") ++ @out@/bin/gettext "$1" | (export PATH `envsubst --variables "$1"`; envsubst "$1") + } + + # eval_ngettext MSGID MSGID-PLURAL COUNT + # looks up the translation of MSGID / MSGID-PLURAL for COUNT and substitutes + # 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") + } + + # Note: This use of envsubst is much safer than using the shell built-in 'eval' |