public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #50280: xorg: init xf86-video-vboxvideo ...

Browse Source 
Based on reports X wouldn't start out of the box and seems OK now.
In case there are still some problems, we can improve later.
I checked that nixos.tests.virtualbox.* still succeed.
This commit is contained in:
Vladimír Čunát
2018-11-14 20:34:48 +01:00
parent 25864ec2b7 9108b24253
commit e229065842
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/x11/xorg/default.nix
+13
View File
@@ -2470,6 +2470,19 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xf86videovboxvideo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
name = "xf86-video-vboxvideo-1.0.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2;
sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};
xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation {
name = "xf86-video-vesa-2.4.0";
builder = ./builder.sh;
pkgs/servers/x11/xorg/tarballs-7.7.list
+1
View File
@@ -164,6 +164,7 @@ mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2