diff options
| author | Carter Charbonneau <zcarterc@gmail.com> | 2017-08-03 13:01:27 -0600 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-04 03:32:29 +0200 |
| commit | 14bd516fa683fdc14522187ea567323a276ea3cb (patch) | |
| tree | 440c2febc2b6ddabd0a5779d8ffeca97be32705a /pkgs/servers | |
| parent | a37dd362b6116fc8e9622e927d2fec41e950f1b9 (diff) | |
| download | nixlib-14bd516fa683fdc14522187ea567323a276ea3cb.tar nixlib-14bd516fa683fdc14522187ea567323a276ea3cb.tar.gz nixlib-14bd516fa683fdc14522187ea567323a276ea3cb.tar.bz2 nixlib-14bd516fa683fdc14522187ea567323a276ea3cb.tar.lz nixlib-14bd516fa683fdc14522187ea567323a276ea3cb.tar.xz nixlib-14bd516fa683fdc14522187ea567323a276ea3cb.tar.zst nixlib-14bd516fa683fdc14522187ea567323a276ea3cb.zip | |
xf86-video-intel: build intel-virtual-output
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index eb08986e7024..7c052d8ef49f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1821,7 +1821,6 @@ let }; buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; - configureFlags = "--with-default-dri=3"; }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 09f75b436da5..8317bd7ce6fa 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -565,8 +565,9 @@ in }; xf86videointel = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXfixes]; + buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; nativeBuildInputs = [args.autoreconfHook xorg.utilmacros]; + configureFlags = "--with-default-dri=3 --enable-tools"; }; xf86videoxgi = attrs: attrs // { |