From 05d4959251f48ab37a6cc94e99d413efafe60d2a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 20 Feb 2016 21:06:13 +0000 Subject: [PATCH] gettext: expand all gettext.sh paths --- pkgs/development/libraries/gettext/absolute-paths.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gettext/absolute-paths.diff b/pkgs/development/libraries/gettext/absolute-paths.diff index 6d5cf1c1ba24..af37f61a9a41 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'