diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-04-06 12:15:09 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-04-18 07:11:55 +0200 |
commit | 3dba642c33dfb9fe9fca9290b5ea8ede43ed9d54 (patch) | |
tree | 7e83d835d730e62dd5ee9e12926bf883ca6f2a01 /pkgs/servers/x11 | |
parent | 4b6b03e2ce01b8c87126598d945c57e7fb24981c (diff) | |
download | nixpkgs-3dba642c33dfb9fe9fca9290b5ea8ede43ed9d54.tar nixpkgs-3dba642c33dfb9fe9fca9290b5ea8ede43ed9d54.tar.gz nixpkgs-3dba642c33dfb9fe9fca9290b5ea8ede43ed9d54.tar.bz2 nixpkgs-3dba642c33dfb9fe9fca9290b5ea8ede43ed9d54.tar.lz nixpkgs-3dba642c33dfb9fe9fca9290b5ea8ede43ed9d54.tar.xz nixpkgs-3dba642c33dfb9fe9fca9290b5ea8ede43ed9d54.tar.zst nixpkgs-3dba642c33dfb9fe9fca9290b5ea8ede43ed9d54.zip |
xorg: add xf86-input-libinput and xf86-video-i740
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 20 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 2 |
3 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6d43a054382..b7e5eef6d56 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1414,6 +1414,16 @@ let buildInputs = [pkgconfig 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" { name = "xf86-input-mouse-1.9.1"; builder = ./builder.sh; @@ -1564,6 +1574,16 @@ let buildInputs = [pkgconfig 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" { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 121b9c38683..be9a43e2bb8 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -207,6 +207,11 @@ in installFlags = "sdkdir=\${out}/include/xorg"; }; + xf86inputlibinput = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ args.libinput ]; + installFlags = "sdkdir=\${out}/include/xorg"; + }; + xf86inputsynaptics = attrs: attrs // { buildInputs = attrs.buildInputs ++ [args.mtdev args.libevdev]; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index c8658ec4d04..f02dd1e89f0 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -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-joystick-1.6.2.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-synaptics-1.8.2.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-glint-1.2.8.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-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2 |