From 9c4d5a219d51c3dbcab17fbdc4f7ff15148b5b44 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Wed, 25 Jun 2025 15:46:51 +0000 Subject: [PATCH] feat: Remove rpcs3 since it wont build --- builders/tsuba.nix | 2 +- flake.nix | 6 ++++++ home/apps/default.nix | 5 +++-- home/apps/rpcs3.nix | 18 ++++++++++++++---- home/apps/shadps4.nix | 13 +++++++++++++ nixos/tsuba/default.nix | 1 + 6 file(s) changed, 38 insertion(s)(+), 7 deletion(s)(-) diff --git a/builders/tsuba.nix b/builders/tsuba.nix --- a/builders/tsuba.nix +++ b/builders/tsuba.nix @@ -1,5 +1,5 @@ { - hostName = "rpi"; + hostName = "tsuba"; sshUser = "remotebuilder"; system = "aarch64-linux"; protocol = "ssh-ng"; diff --git a/flake.nix b/flake.nix --- a/flake.nix +++ b/flake.nix @@ -333,6 +333,12 @@ ]; }; }; + installerImages = let + nixos = self.nixosConfigurations; + mkImage = nixosConfig: nixosConfig.config.system.build.sdImage; + in { + tsuba = mkImage nixos.tsuba; + }; deploy = import ./deploy.nix {inherit inputs self;}; inherit devices; } diff --git a/home/apps/default.nix b/home/apps/default.nix --- a/home/apps/default.nix +++ b/home/apps/default.nix @@ -29,10 +29,11 @@ ./zathura.nix ./zed.nix ./discord.nix ./slack.nix - ./rpcs3.nix + # ./rpcs3.nix ./pcsx2.nix + # ./shadps4.nix + # ./seafile.nix ./blueman.nix ./zen.nix - # ./seafile.nix ]; } diff --git a/home/apps/rpcs3.nix b/home/apps/rpcs3.nix --- a/home/apps/rpcs3.nix +++ b/home/apps/rpcs3.nix @@ -4,9 +4,19 @@ lib, ... }: { home.packages = lib.optionals pkgs.stdenv.isLinux [ - (pkgs.rpcs3.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; - buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; - })) + ((pkgs.rpcs3.override { + opencv = + (pkgs.opencv.override { + enableCuda = true; + }) + .overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; + buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; + }); + }) + .overrideAttrs (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; + buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; + })) ]; } diff --git a/home/apps/shadps4.nix b/home/apps/shadps4.nix new file mode 100644 --- /dev/null +++ b/home/apps/shadps4.nix @@ -0,0 +1,13 @@ +{ + pkgs, + lib, + ... +}: { + home.packages = lib.optionals pkgs.stdenv.isLinux [ + (pkgs.shadps4.overrideAttrs + (oldAttrs: { + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; + buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; + })) + ]; +} diff --git a/nixos/tsuba/default.nix b/nixos/tsuba/default.nix --- a/nixos/tsuba/default.nix +++ b/nixos/tsuba/default.nix @@ -14,6 +14,7 @@ inherit nixpkgs; system = device.system; specialArgs = { inherit device; + nixos-raspberrypi = inputs.nixos-raspberrypi; stablePkgs = inputs.nixpkgs-stable.legacyPackages.${device.system}; }; modules = [ -- tangled.sh