mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 12:23:02 +00:00
gettext: expand all gettext.sh paths
This commit is contained in:
parent
8bfc5d7e72
commit
05d4959251
@ -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'
|
||||
|
Loading…
Reference in New Issue
Block a user