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: a008c42d22f3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 90cca3790492
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 25, 2021

  1. libxkbcommon: Enable libxkbregistry 

    This also enables the "list" subcommand of xkbcli.

Since libxkbregistry is an optional library we could install it into a
different output. However, doing this properly is quite challenging and
the best approach would likely be to upstream patches that add a Meson
option for installing libxkbregistry under a separate prefix (so that
the pkg-config file is generated correctly, etc.).
But even then the default fixup phase would try to move
$libxkbregistry/include into the $dev output and the $out output would
depend on the $libxkbcommon output because of the xkbcli binary (though
we could move that into a $bin output).
As a result it seems best not to install libxkbregistry into a dedicated
output path.
    @primeos
    primeos committed Jan 25, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    kraenhansen Kræn Hansen
    SSH Key Fingerprint: Pl/0muSeAJtfZzXTskmf7NspKHTlgrI4SZS/qPTQ5Eg
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3762bb5 View commit details

  2. Merge pull request #110773 from primeos/libxkbcommon-xkbregistry 

    libxkbcommon: Enable libxkbregistry
    @SuperSandro2000
    SuperSandro2000 authored Jan 25, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    kraenhansen Kræn Hansen
    SSH Key Fingerprint: Pl/0muSeAJtfZzXTskmf7NspKHTlgrI4SZS/qPTQ5Eg
    Verified
    Learn about vigilant mode
    Copy the full SHA
    90cca37 View commit details
Showing with 0 additions and 1 deletion.
  1. +0 −1 pkgs/development/libraries/libxkbcommon/default.nix
1 change: 0 additions & 1 deletion pkgs/development/libraries/libxkbcommon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
"-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"
"-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc)
"-Dx-locale-root=${libX11.out}/share/X11/locale"
"-Denable-xkbregistry=false" # Optional, separate library (TODO: Install into extra output)
"-Denable-wayland=${lib.boolToString withWaylandSupport}"
];