diff options
| author | Bart Bakker <bart@thesoftwarecraft.com> | 2018-10-25 19:21:04 +0200 |
|---|---|---|
| committer | Bart Bakker <bart@thesoftwarecraft.com> | 2018-10-27 09:57:29 +0200 |
| commit | f565b95ca383574e32e843da811f939fe1d69baa (patch) | |
| tree | f6e2d66942273ba1ff6676c7899d0de257b347cf /pkgs/servers | |
| parent | f22413f87431b1d60014a465d6cfe15be983e55d (diff) | |
| download | nixlib-f565b95ca383574e32e843da811f939fe1d69baa.tar nixlib-f565b95ca383574e32e843da811f939fe1d69baa.tar.gz nixlib-f565b95ca383574e32e843da811f939fe1d69baa.tar.bz2 nixlib-f565b95ca383574e32e843da811f939fe1d69baa.tar.lz nixlib-f565b95ca383574e32e843da811f939fe1d69baa.tar.xz nixlib-f565b95ca383574e32e843da811f939fe1d69baa.tar.zst nixlib-f565b95ca383574e32e843da811f939fe1d69baa.zip | |
xorg.xf86videovmware: fix for GFX support
Fix the mesa dependency for `xorg.xf86videovmware`. Add `llvm_6` because `mesa_noglu` has a runtime dependency on clang (see TODO in `development/libraries/mesa`).
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"]; }; |