cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

xorg.xkeyboardconfig: build with meson

Browse source
This commit is contained in:
Nick Cao 2023-07-04 11:57:13 +08:00
parent ddbc49bb57
commit c24f38ad30
No known key found for this signature in database
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/servers/x11/xorg/overrides.nix
View file

@ -1,7 +1,7 @@
{ abiCompat ? null, { abiCompat ? null,
callPackage, callPackage,
lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, lib, stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages,
automake, autoconf, libiconv, libtool, intltool, automake, autoconf, libiconv, libtool, intltool, gettext, python3, perl,
freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, netbsd, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, netbsd,
ncompress, ncompress,
@ -538,10 +538,20 @@ self: super:
}); });
xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: {
prePatch = "patchShebangs rules/merge.py"; prePatch = ''
nativeBuildInputs = attrs.nativeBuildInputs ++ [ intltool libxslt ]; patchShebangs rules/merge.py rules/compat/map-variants.py rules/xml2lst.pl
configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; '';
nativeBuildInputs = attrs.nativeBuildInputs ++ [
meson
ninja
python3
perl
libxslt # xsltproc
gettext # msgfmt
];
mesonFlags = [
(lib.mesonBool "xorg-rules-symlinks" true)
];
# 1: compatibility for X11/xkb location # 1: compatibility for X11/xkb location
# 2: I think pkg-config/ is supposed to be in /lib/ # 2: I think pkg-config/ is supposed to be in /lib/
postInstall = '' postInstall = ''