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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c77a95dc0de0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 78956495de99
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 7, 2020

  1. libxkbcommon: fix build on darwin (#79393) 

    The patch is already in upstream
    @clkamp
    clkamp authored Feb 7, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7895649 View commit details
Showing with 0 additions and 8 deletions.
  1. +0 −8 pkgs/development/libraries/libxkbcommon/default.nix
8 changes: 0 additions & 8 deletions pkgs/development/libraries/libxkbcommon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,14 +20,6 @@ stdenv.mkDerivation rec {
"-Dx-locale-root=${libX11.out}/share/X11/locale"
];

patches = stdenv.lib.optionals stdenv.isDarwin [
# Fix build on darwin
(fetchpatch {
url = "https://github.com/xkbcommon/libxkbcommon/commit/32d178b50fe0da05e51e4fe8903c84371d133331.patch";
sha256 = "1wqdjla8hmgdqr8xc2manw363sxrqqsn3s8bd397h3cd7fj3hh1v";
})
];

doCheck = false; # fails, needs unicode locale

meta = with stdenv.lib; {