MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

libxkbcommon: Enable libxkbregistry

Browse source 
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.
This commit is contained in:
Michael Weiss 2021-01-24 14:40:12 +01:00
parent 428e0fdc54
commit 3762bb5390
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/libraries/libxkbcommon/default.nix
View file

@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
"-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"
"-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc) "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc)
"-Dx-locale-root=${libX11.out}/share/X11/locale" "-Dx-locale-root=${libX11.out}/share/X11/locale"
"-Denable-xkbregistry=false" # Optional, separate library (TODO: Install into extra output)
"-Denable-wayland=${lib.boolToString withWaylandSupport}" "-Denable-wayland=${lib.boolToString withWaylandSupport}"
]; ];