b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #101695 from lourkeur/xkeyboard-config

Browse source 
xkeyboard-config: 2.27 -> 2.31
This commit is contained in:
Matthieu Coudron 2020-10-27 15:11:04 +01:00 committed by GitHub
parent 8b98955451 3f381d579d
commit e3d3bc66dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/servers/x11/xorg/default.nix
View file

@ -2522,16 +2522,19 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
name = "xkeyboard-config-2.27";
xkeyboardconfig = callPackage ({ stdenv, python3, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
name = "xkeyboard-config-2.31";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2";
sha256 = "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9";
url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2";
sha256 = "18xddaxh83zm698syh50w983jg6b7b8zgv0dfaf7ha485hgihi6s";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig python3 ];
buildInputs = [ libX11 xorgproto ];
prePatch = ''
patchShebangs rules/merge.py
'';
meta.platforms = stdenv.lib.platforms.unix;
}) {};

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

@ -318,8 +318,9 @@ self: super:
setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
postInstall =
''
mkdir -p $out/share
mkdir -p $out/share/man/man7
ln -sfn ${self.xkeyboardconfig}/etc/X11 $out/share/X11
ln -sfn ${self.xkeyboardconfig}/share/man/man7/xkeyboard-config.7.gz $out/share/man/man7
'';
});