diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-26 22:05:12 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-26 22:05:15 +0200 |
| commit | dfd80a1b7e49e580b676ae28c3ca5f7a53887668 (patch) | |
| tree | b94f1701347a1f3f971a2ae7930ffef1dcc734e1 /pkgs/servers/x11 | |
| parent | e8dc6258a1b5b11846fecf4a00c56a308dd22527 (diff) | |
| parent | 7998a598b65df13624b82fbc6be8efd33da2fb5a (diff) | |
| download | nixpkgs-dfd80a1b7e49e580b676ae28c3ca5f7a53887668.tar nixpkgs-dfd80a1b7e49e580b676ae28c3ca5f7a53887668.tar.gz nixpkgs-dfd80a1b7e49e580b676ae28c3ca5f7a53887668.tar.bz2 nixpkgs-dfd80a1b7e49e580b676ae28c3ca5f7a53887668.tar.lz nixpkgs-dfd80a1b7e49e580b676ae28c3ca5f7a53887668.tar.xz nixpkgs-dfd80a1b7e49e580b676ae28c3ca5f7a53887668.tar.zst nixpkgs-dfd80a1b7e49e580b676ae28c3ca5f7a53887668.zip | |
Merge recent master into x-updates
Hydra eval: 1131611
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 124d01df7d4..61e106a136b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1869,6 +1869,16 @@ let buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; + xkbprint = (stdenv.mkDerivation ((if overrides ? xkbprint then overrides.xkbprint else x: x) { + name = "xkbprint-1.0.3"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/xkbprint-1.0.3.tar.bz2; + sha256 = "1h4jb3gjrbjp79h5gcgkjvdxykcy2bmq03smpls820c8wnw6v17s"; + }; + buildInputs = [pkgconfig libX11 libxkbfile ]; + })) // {inherit libX11 libxkbfile ;}; + xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) { name = "xkbutils-1.0.4"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index a4a349843de..fb159520fc2 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -185,3 +185,4 @@ mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2 +mirror://xorg/individual/app/xkbprint-1.0.3.tar.bz2 |