From 470e333d007ed7c9b4e60572b78326be65636e45 Mon Sep 17 00:00:00 2001 From: Antoine Viallon Date: Mon, 11 Mar 2024 00:17:49 +0100 Subject: [PATCH] [Gaming+Flake] add suyu flake and add back yuzu using suyu fork --- desktop/games.nix | 6 +++--- flake.nix | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/desktop/games.nix b/desktop/games.nix index e45af85..1c76767 100644 --- a/desktop/games.nix +++ b/desktop/games.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, myLib, ... }: +{ config, pkgs, lib, myLib, suyu, ... }: with lib; let cfg = config.aviallon.desktop; @@ -12,10 +12,10 @@ in { enable = mkEnableOption "gaming features"; emulation = mkEnableOption "console emulators"; yuzu.package = mkOption { - description = "Yuzu switch emulator package"; type = with types; package; + description = "Yuzu switch emulator package. WARNING: removed from nixpkgs"; example = pkgs.yuzu-early-access; - default = pkgs.unstable.yuzu-early-access; + default = suyu.packages.${builtins.currentSystem}.suyu; }; ryujinx.package = mkOption { description = "Ryujinx Switch emulator package"; diff --git a/flake.nix b/flake.nix index 0e3aaf1..c03763a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,11 @@ nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nur.url = "github:nix-community/NUR"; + suyu = { + url = "github:Noodlez1232/suyu-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; fps.url = "github:wamserma/flake-programs-sqlite"; fps.inputs.nixpkgs.follows = "nixpkgs"; @@ -23,6 +28,7 @@ , nixpkgs-unstable , fps , sddm-unstable + , suyu , ... }: let lib = nixpkgs.lib;