Merge master into staging

This commit is contained in:
Frederik Rietdijk
2018-07-22 11:14:41 +02:00
2379 changed files with 66329 additions and 36190 deletions

View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, lib
, pkgconfig, intltool, autoreconfHook, substituteAll
{ stdenv, fetchurl, lib
, pkgconfig, intltool, autoreconfHook
, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau, valgrind-light, python2