diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-06 11:29:45 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 07:08:45 +0200 |
| commit | 4b6b03e2ce01b8c87126598d945c57e7fb24981c (patch) | |
| tree | b14a096792ba4106f21a69af7980da33fc5e8411 /pkgs/servers/x11 | |
| parent | 4f0dae99f9527e7fcce03eef298ad0958bff24d6 (diff) | |
| download | nixlib-4b6b03e2ce01b8c87126598d945c57e7fb24981c.tar nixlib-4b6b03e2ce01b8c87126598d945c57e7fb24981c.tar.gz nixlib-4b6b03e2ce01b8c87126598d945c57e7fb24981c.tar.bz2 nixlib-4b6b03e2ce01b8c87126598d945c57e7fb24981c.tar.lz nixlib-4b6b03e2ce01b8c87126598d945c57e7fb24981c.tar.xz nixlib-4b6b03e2ce01b8c87126598d945c57e7fb24981c.tar.zst nixlib-4b6b03e2ce01b8c87126598d945c57e7fb24981c.zip | |
xcb-util-cursor: autogenerate as other xorg pkgs
HEAD version still needed on darwin, reportedly: https://github.com/vcunat/nixpkgs/commit/0c915b8812#commitcomment-10615086
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/extra.list | 1 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 |
3 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 813968ebfa97..6d43a0543828 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -709,7 +709,7 @@ let builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2; - sha256 = "b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098"; + sha256 = "1630v3sfvwwlimb2ja10c84ql6v1mw9bdfhvan7pbybkgi99h25p"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -1194,6 +1194,16 @@ let buildInputs = [pkgconfig gperf m4 libxcb xproto ]; }) // {inherit gperf m4 libxcb xproto ;}; + xcbutilcursor = (mkDerivation "xcbutilcursor" { + name = "xcb-util-cursor-0.1.2"; + builder = ./builder.sh; + src = fetchurl { + url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2; + sha256 = "0fpv46zb7kz04qxwvpax4cpd2kd8yhsm2n0if1isniqdh5xkcrgd"; + }; + buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; + }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;}; + xcbutilimage = (mkDerivation "xcbutilimage" { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 703c920c98ea..f0bf8bf73782 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -2,6 +2,7 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 61c1391ae09e..121b9c38683d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -189,6 +189,10 @@ in buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ]; }; + xcbutilcursor = attrs: attrs // { + meta.maintainers = [ stdenv.lib.maintainers.lovek323 ]; + }; + xf86inputevdev = attrs: attrs // { preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; installFlags = "sdkdir=\${out}/include/xorg"; |