diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 23:33:03 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 23:33:03 -0400 |
| commit | 5e17335bd7ff853379122e08dadfaa2fc1c020b7 (patch) | |
| tree | 911e75d700bebef1aa60fedcaa6a29b5032d6428 /pkgs/development/libraries/gettext | |
| parent | 330ca731e88ec015181c43d92ae8f7c77cf0226a (diff) | |
| parent | 0fc21a364bfd6b2dea9010fdf21415ff3de1805a (diff) | |
| download | nixpkgs-5e17335bd7ff853379122e08dadfaa2fc1c020b7.tar nixpkgs-5e17335bd7ff853379122e08dadfaa2fc1c020b7.tar.gz nixpkgs-5e17335bd7ff853379122e08dadfaa2fc1c020b7.tar.bz2 nixpkgs-5e17335bd7ff853379122e08dadfaa2fc1c020b7.tar.lz nixpkgs-5e17335bd7ff853379122e08dadfaa2fc1c020b7.tar.xz nixpkgs-5e17335bd7ff853379122e08dadfaa2fc1c020b7.tar.zst nixpkgs-5e17335bd7ff853379122e08dadfaa2fc1c020b7.zip | |
Merge remote-tracking branch 'upstream/staging' into strictDeps
Diffstat (limited to 'pkgs/development/libraries/gettext')
| -rw-r--r-- | pkgs/development/libraries/gettext/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/gettext/gettext-setup-hook.sh | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index b6855a7e26d..abc24700fa2 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -44,7 +44,11 @@ stdenv.mkDerivation rec { # HACK, see #10874 (and 14664) buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; - setupHook = ./gettext-setup-hook.sh; + setupHooks = [ + ../../../build-support/setup-hooks/role.bash + ./gettext-setup-hook.sh + ]; + gettextNeedsLdflags = hostPlatform.libc != "glibc" && !hostPlatform.isMusl; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh index 5932ef6a44f..0a6bc0dd253 100644 --- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -1,7 +1,17 @@ gettextDataDirsHook() { + # See pkgs/build-support/setup-hooks/role.bash + getHostRoleEnvHook if [ -d "$1/share/gettext" ]; then - addToSearchPath GETTEXTDATADIRS "$1/share/gettext" + addToSearchPath "GETTEXTDATADIRS${role_post}" "$1/share/gettext" fi } addEnvHooks "$hostOffset" gettextDataDirsHook + +# libintl must be listed in load flags on non-Glibc +# it doesn't hurt to have it in Glibc either though +if [ ! -z "@gettextNeedsLdflags@" ]; then + # See pkgs/build-support/setup-hooks/role.bash + getHostRole + export NIX_${role_pre}LDFLAGS+=" -lintl" +fi |