Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 25864ec2b74c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e2290658421a
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 12, 2018

  1. xorg: init xf86-video-vboxvideo at 1.0.0 

    ... and switch to it by default in virtualbox guests
    @vcunat
    vcunat committed Nov 12, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    schneefux
    GPG key ID: 50F2BF336737C2F0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9108b24 View commit details

Commits on Nov 14, 2018

  1. 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.
    @vcunat
    vcunat committed Nov 14, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e229065 View commit details
Showing with 16 additions and 3 deletions.
  1. +2 −3 nixos/modules/services/x11/xserver.nix
  2. +13 −0 pkgs/servers/x11/xorg/default.nix
  3. +1 −0 pkgs/servers/x11/xorg/tarballs-7.7.list
5 changes: 2 additions & 3 deletions nixos/modules/services/x11/xserver.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,8 @@ let

# Map video driver names to driver packages. FIXME: move into card-specific modules.
knownVideoDrivers = {
virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
# Alias so people can keep using "virtualbox" instead of "vboxvideo".
virtualbox = { modules = [ xorg.xf86videovboxvideo ]; driverName = "vboxvideo"; };

# modesetting does not have a xf86videomodesetting package as it is included in xorgserver
modesetting = {};
@@ -564,8 +565,6 @@ in
knownVideoDrivers;
in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver));

nixpkgs.config = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { xorg.abiCompat = "1.18"; };

assertions = [
{ assertion = config.security.polkit.enable;
message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’).";
13 changes: 13 additions & 0 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
1 change: 1 addition & 0 deletions pkgs/servers/x11/xorg/tarballs-7.7.list
View file
Original file line number Diff line number Diff line change
@@ -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