Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: eae4eec50e8e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4ae1790f6dcf
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 23, 2018

  1. gettext: don't add -lintl on musl, either 

    gettext won't actually provide libintl unless we go out of
our way to tell it to do so [1][2].

We could add those flags on musl (as I initially did in [3]),
but then we have two different libintl.h files and generally
some confusion about which gettext is being used.

Instead of sorting that out, for now let's just continue on
without gettext providing libintl-- it's worked well enough so far.

Only change that needs to be made, then, is to avoid
adding -lintl on musl since there is no libintl.

[1] pullmoll/void-packages@c739240
[2] https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libintl/libintl-0.19.8.1.ebuild?id=332e48712b6521697f992f923c9c985482dd1c36#n41
[3] dtzWill@729302f
    @dtzWill
    dtzWill committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    b59fd70 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #37688 from dtzWill/fix/no-libintl-musl 

    gettext: don't add -lintl on musl, either
    @dtzWill
    dtzWill committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    4ae1790 View commit details
    Browse the repository at this point in the history