diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-25 18:52:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 18:52:08 +0000 |
| commit | a127deeb889b111138f5152e54681577706ab741 (patch) | |
| tree | 229b3bde60ee64c4ee7b14ee1360c0755f22888d /pkgs/misc/emulators | |
| parent | 351b28d469b5c29b06b7f6cac4f6bd36513f2606 (diff) | |
| parent | 9ce1caa63c9c806e705cd0d282a4aa920dce76fd (diff) | |
| download | nixlib-a127deeb889b111138f5152e54681577706ab741.tar nixlib-a127deeb889b111138f5152e54681577706ab741.tar.gz nixlib-a127deeb889b111138f5152e54681577706ab741.tar.bz2 nixlib-a127deeb889b111138f5152e54681577706ab741.tar.lz nixlib-a127deeb889b111138f5152e54681577706ab741.tar.xz nixlib-a127deeb889b111138f5152e54681577706ab741.tar.zst nixlib-a127deeb889b111138f5152e54681577706ab741.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/citra/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/firebird-emu/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/melonDS/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/ruffle/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/staging.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/yabause/default.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index d092a8786838..e1a31d208e48 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: +{ mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: mkDerivation { pname = "citra"; diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix index 236eff8610cc..c766df9e3c03 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qtdeclarative }: mkDerivation rec { pname = "firebird-emu"; diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix index f8d43cc8999d..a53d2bfc339e 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , mkDerivation , cmake diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix index 475e54076fc2..9e1f986341f7 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -5,7 +5,7 @@ , pkg-config , python3 , rustPlatform -, lib, stdenv +, lib , wayland , xorg , vulkan-loader diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 24da1d86bbfd..abfc4f832a3b 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, wineUnstable }: +{ lib, callPackage, wineUnstable }: with callPackage ./util.nix {}; diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index 43f077227dbf..17b7b563c15f 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.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 { |