From 5a7f4d6114f63d75ea323ebe4c669149620f9e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 20 Nov 2018 23:16:09 +0100 Subject: [PATCH] gettext: remove cross suffix from envHook `role_post` is meant for cross compilation, eg. `CC_FOR_BUILD` and `CC_FOR_TARGET`. There's no such concept for `GETTEXTDATADIRS`. In particular we hit this with `cantarell-fonts`, where only `GETTEXTDATADIRS_FOR_BUILD` is defined due to empty buildInputs. see https://github.com/NixOS/nixpkgs/issues/50855 --- pkgs/development/libraries/gettext/gettext-setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh index 0a6bc0dd253af4..9487e6a536d6b6 100644 --- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -2,7 +2,7 @@ gettextDataDirsHook() { # See pkgs/build-support/setup-hooks/role.bash getHostRoleEnvHook if [ -d "$1/share/gettext" ]; then - addToSearchPath "GETTEXTDATADIRS${role_post}" "$1/share/gettext" + addToSearchPath GETTEXTDATADIRS "$1/share/gettext" fi }