diff options
| author | Kirill Elagin <kirelagin@gmail.com> | 2020-01-30 01:41:12 -0500 |
|---|---|---|
| committer | Kirill Elagin <kirelagin@gmail.com> | 2020-01-30 21:22:32 -0500 |
| commit | d9e4fc31ea7728b39c1ff2f2963e4f3df716b6b7 (patch) | |
| tree | 76519334398db5fee7390585412e5e4833401a36 /pkgs/development/libraries/gettext | |
| parent | 16ffc74a32392d203ffaeb37a486fb55e1c4e7d1 (diff) | |
| download | nixpkgs-d9e4fc31ea7728b39c1ff2f2963e4f3df716b6b7.tar nixpkgs-d9e4fc31ea7728b39c1ff2f2963e4f3df716b6b7.tar.gz nixpkgs-d9e4fc31ea7728b39c1ff2f2963e4f3df716b6b7.tar.bz2 nixpkgs-d9e4fc31ea7728b39c1ff2f2963e4f3df716b6b7.tar.lz nixpkgs-d9e4fc31ea7728b39c1ff2f2963e4f3df716b6b7.tar.xz nixpkgs-d9e4fc31ea7728b39c1ff2f2963e4f3df716b6b7.tar.zst nixpkgs-d9e4fc31ea7728b39c1ff2f2963e4f3df716b6b7.zip | |
gettext: Add macOS warning patch
gettext 0.20 fixed a bug with handling locale on macOS, but this caused it to report an annoying warning on systems where “language” differs from “region”. See Homebrew issue for details: <https://github.com/Homebrew/homebrew-core/issues/41139>. Add upstream patch that has not been released yet. Details: <https://www.mail-archive.com/bug-gnulib@gnu.org/msg36768.html>.
Diffstat (limited to 'pkgs/development/libraries/gettext')
| -rw-r--r-- | pkgs/development/libraries/gettext/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index c2165a9d9c7..50f56ec442d 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libiconv, xz }: +{ stdenv, lib, fetchurl, libiconv, xz, fetchpatch }: stdenv.mkDerivation rec { pname = "gettext"; @@ -11,7 +11,15 @@ stdenv.mkDerivation rec { patches = [ ./absolute-paths.diff ./gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch - ]; + ] + # HACK: Since this is merely a UX fix, to minimise rebuilds only patch + # the final library. + # Remove the entire thing when updating to the next release. + ++ lib.optional (stdenv.isDarwin && !(lib.hasPrefix "bootstrap" stdenv.name)) + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/gettext.git/patch?id=ec0e6b307456ceab352669ae6bccca9702108753"; + sha256 = "0xqs01c7xl7vmw6bqvsmrzxxjxk2a4spcdpmlwm3b4hi2wc2lxnf"; + }); outputs = [ "out" "man" "doc" "info" ]; |