JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gettext: Add macOS warning patch

Browse Source 
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>.
This commit is contained in:
Kirill Elagin 2020-01-30 01:41:12 -05:00
parent 16ffc74a32
commit d9e4fc31ea
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/gettext/default.nix
View File

@ -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" ];