Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-06-18 11:07:56 +02:00
928 changed files with 2418 additions and 2149 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, pkgs, buildFHSUserEnv, makeDesktopItem, fetchFromGitHub, fetchpatch
, wrapGAppsHook, python2Packages, python3Packages }:
{ stdenv, pkgs, buildFHSUserEnv, makeDesktopItem, fetchFromGitHub
, wrapGAppsHook, python3Packages }:
let
qt5Deps = with pkgs; with qt5; [ qtbase qtmultimedia ];