diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-11-14 20:34:48 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-11-14 20:34:48 +0100 |
| commit | e2290658421a44af98f9747b951e9945518da5c9 (patch) | |
| tree | a49de6c0a71908d038b9532440aed6369c5efee0 /pkgs/servers | |
| parent | 25864ec2b74cf79e99d212b9ef16057bfc79a895 (diff) | |
| parent | 9108b24253283cb776ff8c8520a349c3024b51ad (diff) | |
| download | nixpkgs-e2290658421a44af98f9747b951e9945518da5c9.tar nixpkgs-e2290658421a44af98f9747b951e9945518da5c9.tar.gz nixpkgs-e2290658421a44af98f9747b951e9945518da5c9.tar.bz2 nixpkgs-e2290658421a44af98f9747b951e9945518da5c9.tar.lz nixpkgs-e2290658421a44af98f9747b951e9945518da5c9.tar.xz nixpkgs-e2290658421a44af98f9747b951e9945518da5c9.tar.zst nixpkgs-e2290658421a44af98f9747b951e9945518da5c9.zip | |
Merge #50280: xorg: init xf86-video-vboxvideo ...
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.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c53bd912172..b53a5a23533 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index a832302abdc..1775d697d81 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -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 |