diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-30 12:06:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 12:06:24 +0000 |
| commit | c9e9ff786bc9ea043ec068bf731195ee4961f612 (patch) | |
| tree | f1f47dfddb40f321760db84c0499dfcaafcaf5aa /pkgs/servers/x11 | |
| parent | ce7cdafed966fd593e1a0fe373bd0b237923d540 (diff) | |
| parent | f15cbfdfcd881745203f253832396c27d204a551 (diff) | |
| download | nixpkgs-c9e9ff786bc9ea043ec068bf731195ee4961f612.tar nixpkgs-c9e9ff786bc9ea043ec068bf731195ee4961f612.tar.gz nixpkgs-c9e9ff786bc9ea043ec068bf731195ee4961f612.tar.bz2 nixpkgs-c9e9ff786bc9ea043ec068bf731195ee4961f612.tar.lz nixpkgs-c9e9ff786bc9ea043ec068bf731195ee4961f612.tar.xz nixpkgs-c9e9ff786bc9ea043ec068bf731195ee4961f612.tar.zst nixpkgs-c9e9ff786bc9ea043ec068bf731195ee4961f612.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 54082ce8126..c5b2d400eb4 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -4,7 +4,7 @@ freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkg-config, llvm_6, libxslt, + mcpp, epoxy, openssl, pkg-config, llvm, libxslt, ApplicationServices, Carbon, Cocoa, Xplugin }: @@ -433,7 +433,7 @@ self: super: }); xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ mesa llvm_6 ]; # for libxatracker + buildInputs = attrs.buildInputs ++ [ mesa llvm ]; # for libxatracker meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; |