Merge master into staging-next

2021-01-25 18:52:08 +00:00
parent 351b28d469 9ce1caa63c
commit a127deeb88
2813 changed files with 3233 additions and 2989 deletions
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:
+{ mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:

 mkDerivation {
  pname = "citra";
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }:
+{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qtdeclarative }:

 mkDerivation rec {
  pname = "firebird-emu";
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , mkDerivation
 , cmake
@@ -5,7 +5,7 @@
 , pkg-config
 , python3
 , rustPlatform
-, lib, stdenv
+, lib
 , wayland
 , xorg
 , vulkan-loader
@@ -1,4 +1,4 @@
-{ lib, stdenv, callPackage, wineUnstable }:
+{ lib, callPackage, wineUnstable }:

 with callPackage ./util.nix {};

@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL
+{ mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL
 , freeglut ? null, openal ? null, SDL2 ? null }:

 mkDerivation rec {