diff options
| author | Louis <louis@bettens.info> | 2020-10-22 19:25:58 +0200 |
|---|---|---|
| committer | Louis <louis@bettens.info> | 2020-10-24 20:22:31 +0200 |
| commit | 3cf12aa9c601514be923a5a1b5f5d1675a585c5d (patch) | |
| tree | 5af4790887af7b15beb1a847f94247ef8dde984f /pkgs/servers/x11 | |
| parent | d5ebdf57c863907daf1003e77d1212a7c6dc3a27 (diff) | |
| download | nixlib-3cf12aa9c601514be923a5a1b5f5d1675a585c5d.tar nixlib-3cf12aa9c601514be923a5a1b5f5d1675a585c5d.tar.gz nixlib-3cf12aa9c601514be923a5a1b5f5d1675a585c5d.tar.bz2 nixlib-3cf12aa9c601514be923a5a1b5f5d1675a585c5d.tar.lz nixlib-3cf12aa9c601514be923a5a1b5f5d1675a585c5d.tar.xz nixlib-3cf12aa9c601514be923a5a1b5f5d1675a585c5d.tar.zst nixlib-3cf12aa9c601514be923a5a1b5f5d1675a585c5d.zip | |
xkeyboard-config: 2.27 -> 2.31
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 81ce111ecacc..37858983220f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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; }) {}; |