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

xorg: add xf86-input-libinput and xf86-video-i740

Browse source
This commit is contained in:
Vladimír Čunát 2015-04-06 12:15:09 +02:00
parent 4b6b03e2ce
commit 3dba642c33
4 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1414,6 +1414,16 @@ let
buildInputs = [pkgconfig inputproto xorgserver xproto ]; buildInputs = [pkgconfig inputproto xorgserver xproto ];
}) // {inherit inputproto xorgserver xproto ;}; }) // {inherit inputproto xorgserver xproto ;};
xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
name = "xf86-input-libinput-0.8.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-input-libinput-0.8.0.tar.bz2;
sha256 = "0fm4vrkw7azipbnwvc2l18g65z77pllsznaajd8q3zpg9ycb0li1";
};
buildInputs = [pkgconfig inputproto xorgserver xproto ];
}) // {inherit inputproto xorgserver xproto ;};
xf86inputmouse = (mkDerivation "xf86inputmouse" { xf86inputmouse = (mkDerivation "xf86inputmouse" {
name = "xf86-input-mouse-1.9.1"; name = "xf86-input-mouse-1.9.1";
builder = ./builder.sh; builder = ./builder.sh;
@ -1564,6 +1574,16 @@ let
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
}) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoi740 = (mkDerivation "xf86videoi740" {
name = "xf86-video-i740-1.3.5";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2;
sha256 = "0973zzmdsvlmplcax1c91is7v78lcwy6d9mwp11npgqzl782vq0w";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
}) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videointel = (mkDerivation "xf86videointel" { xf86videointel = (mkDerivation "xf86videointel" {
name = "xf86-video-intel-2.99.917"; name = "xf86-video-intel-2.99.917";
builder = ./builder.sh; builder = ./builder.sh;

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

@ -207,6 +207,11 @@ in
installFlags = "sdkdir=\${out}/include/xorg"; installFlags = "sdkdir=\${out}/include/xorg";
}; };
xf86inputlibinput = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ args.libinput ];
installFlags = "sdkdir=\${out}/include/xorg";
};
xf86inputsynaptics = attrs: attrs // { xf86inputsynaptics = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [args.mtdev args.libevdev]; buildInputs = attrs.buildInputs ++ [args.mtdev args.libevdev];
installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d";

2
pkgs/servers/x11/xorg/tarballs-7.7.list
View file

@ -118,6 +118,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.9.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-libinput-0.8.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
@ -134,6 +135,7 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2
mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2

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

@ -8687,7 +8687,7 @@ let
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
libxslt expat libpng zlib perl mesa_drivers spice_protocol libxslt expat libpng zlib perl mesa_drivers spice_protocol
dbus libuuid openssl gperf m4 libevdev tradcpp dbus libuuid openssl gperf m4 libevdev tradcpp libinput
autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
mesa = mesa_noglu; mesa = mesa_noglu;