diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-30 13:46:02 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-30 13:46:02 +0100 |
| commit | 546bd7738d35094a8d8067581820056c33a9cd8e (patch) | |
| tree | 83322e928a003496f8cb78e9d7362eee03033cec /pkgs/servers/x11 | |
| parent | b27477054f4a330255afb9003667d33b8e679ea5 (diff) | |
| download | nixlib-546bd7738d35094a8d8067581820056c33a9cd8e.tar nixlib-546bd7738d35094a8d8067581820056c33a9cd8e.tar.gz nixlib-546bd7738d35094a8d8067581820056c33a9cd8e.tar.bz2 nixlib-546bd7738d35094a8d8067581820056c33a9cd8e.tar.lz nixlib-546bd7738d35094a8d8067581820056c33a9cd8e.tar.xz nixlib-546bd7738d35094a8d8067581820056c33a9cd8e.tar.zst nixlib-546bd7738d35094a8d8067581820056c33a9cd8e.zip | |
xorg xkeyboard-config: update, unify with the other expression
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9d27b2d1a384..a0cc0c7b148d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1830,11 +1830,11 @@ let })) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) { - name = "xkeyboard-config-2.8"; + name = "xkeyboard-config-2.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2; - sha256 = "1bkq415qw4r3dl139mqgal9v585x7kh3km6z1lraz2j8im3ga72f"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2; + sha256 = "0xkdyyi759hzls42hp4j3q2lc35n4j6b2g44ilx5qarci5h584p7"; }; buildInputs = [pkgconfig libX11 xproto ]; })) // {inherit libX11 xproto ;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0ee3594f6ec0..499d78b947e5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -131,7 +131,7 @@ in postInstall = '' mkdir -p $out/share - ln -sfn ${args.xkeyboard_config}/etc/X11 $out/share/X11 + ln -sfn ${xorg.xkeyboardconfig}/etc/X11 $out/share/X11 ''; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 50a4928e3515..2eb08b1831de 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -159,7 +159,7 @@ mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 |