alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

xcb-util-cursor: autogenerate as other xorg pkgs

Browse source 
HEAD version still needed on darwin, reportedly:
https://github.com/vcunat/nixpkgs/commit/0c915b8812#commitcomment-10615086
This commit is contained in:
Vladimír Čunát 2015-04-06 11:29:45 +02:00
parent 4f0dae99f9
commit 4b6b03e2ce
5 changed files with 17 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkgs/development/libraries/xcb-util-cursor/default.nix
View file

@ -1,38 +0,0 @@
{ stdenv, fetchurl, bashInteractive, autoconf, automake, libtool, pkgconfig
, git, xlibs, gnum4, libxcb, gperf }:
stdenv.mkDerivation rec {
name = "xcb-util-cursor-0.1.1";
src = fetchurl {
url = "http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.1.tar.gz";
sha256 = "0lkjbcml305imyzr80yb8spjvq6y83v2allk5gc9plkv39zag29z";
};
meta = with stdenv.lib; {
description = "XCB cursor library (libxcursor port)";
homepage = http://cgit.freedesktop.org/xcb/util-cursor;
license = licenses.mit;
maintainer = with maintainers; [ lovek323 ];
platforms = platforms.linux;
};
buildInputs = [
autoconf
automake
gnum4
gperf
libtool
libxcb
pkgconfig
xlibs.utilmacros
xlibs.xcbutilimage
xlibs.xcbutilrenderutil
];
configurePhase = ''
sed -i '15 i\
LT_INIT' configure.ac
${bashInteractive}/bin/bash autogen.sh --prefix="$out"
'';
}

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

@ -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;

1
pkgs/servers/x11/xorg/extra.list
View file

@ -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

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

@ -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";

3
pkgs/top-level/all-packages.nix
View file

@ -7801,8 +7801,7 @@ let
xbase = callPackage ../development/libraries/xbase { };
xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { };
xcb-util-cursor = xorg.xcbutilcursor;
xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { };
xdo = callPackage ../tools/misc/xdo { };