diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-10-28 21:05:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-28 21:05:20 +0100 |
| commit | 4f6234f0ec7ff6af7301dc3d037b5d47d3f0e0e2 (patch) | |
| tree | c44d3a4ef7e932528720054c5a0af7a3080c8248 /pkgs/servers | |
| parent | 4249dc2fe73e3d414c3c1d8f3005c2a0a7e1ae24 (diff) | |
| parent | f565b95ca383574e32e843da811f939fe1d69baa (diff) | |
| download | nixlib-4f6234f0ec7ff6af7301dc3d037b5d47d3f0e0e2.tar nixlib-4f6234f0ec7ff6af7301dc3d037b5d47d3f0e0e2.tar.gz nixlib-4f6234f0ec7ff6af7301dc3d037b5d47d3f0e0e2.tar.bz2 nixlib-4f6234f0ec7ff6af7301dc3d037b5d47d3f0e0e2.tar.lz nixlib-4f6234f0ec7ff6af7301dc3d037b5d47d3f0e0e2.tar.xz nixlib-4f6234f0ec7ff6af7301dc3d037b5d47d3f0e0e2.tar.zst nixlib-4f6234f0ec7ff6af7301dc3d037b5d47d3f0e0e2.zip | |
Merge pull request #49115 from bjpbakker/fix-vmware-gfx
Enable GFX in xf86-video-vmware
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 58688590b84e..4772ac7f7ee2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -2,10 +2,10 @@ stdenv, makeWrapper, lib, fetchurl, fetchpatch, automake, autoconf, libtool, intltool, mtdev, libevdev, libinput, - python, freetype, apple_sdk, tradcpp, fontconfig, mesa_drivers, + python, freetype, apple_sdk, tradcpp, fontconfig, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkgconfig }: + mcpp, epoxy, openssl, pkgconfig, llvm_6 }: let inherit (stdenv) lib isDarwin; @@ -394,7 +394,7 @@ self: super: }); xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ mesa_drivers ]; # for libxatracker + buildInputs = attrs.buildInputs ++ [ mesa_noglu llvm_6 ]; # for libxatracker meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; |