From 4191eb50bf06472b29d3add3c9cd6d58f89274d7 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Sat, 11 Jan 2025 20:19:23 +1100
Subject: [PATCH] project-plus: remove sd and launcher from derivation

---
 outputs/pkgs/default.nix              | 21 +++++++++++----------
 outputs/pkgs/project-plus/default.nix |  4 +---
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/outputs/pkgs/default.nix b/outputs/pkgs/default.nix
index 58ba4e5..b49dd40 100644
--- a/outputs/pkgs/default.nix
+++ b/outputs/pkgs/default.nix
@@ -6,25 +6,26 @@
 }: {
   perSystem = {pkgs, ...}: let
     inherit (pkgs) callPackage qt6Packages;
+
+    projectPlus = {
+      fpp-config = callPackage ./project-plus/fpp-config.nix {};
+      fpp-launcher = callPackage ./project-plus/fpp-launcher.nix {};
+      fpp-sd = callPackage ./project-plus/fpp-sd.nix {};
+      package = qt6Packages.callPackage ./project-plus {
+        inherit (projectPlus) fpp-config;
+      };
+    };
   in {
     packages = {
       repopack = callPackage ./repopack {};
       live-buds-cli = callPackage ./live-buds-cli {};
       website = callPackage ./website {};
       caddy-with-cloudflare = callPackage ./caddy-with-cloudflare {};
-
       wii-u-gc-adapter = callPackage ./wii-u-gc-adapter {};
-
       ook-vim = callPackage ./ook-vim {inherit inputs pkgs lib hozen;};
 
-      project-plus = let
-        fpp-config = callPackage ./project-plus/fpp-config.nix {};
-        fpp-launcher = callPackage ./project-plus/fpp-launcher.nix {};
-        fpp-sd = callPackage ./project-plus/fpp-sd.nix {};
-      in
-        qt6Packages.callPackage ./project-plus {
-          inherit fpp-launcher fpp-sd fpp-config;
-        };
+      inherit (projectPlus) fpp-config fpp-launcher fpp-sd;
+      project-plus = projectPlus.package;
     };
   };
 }
diff --git a/outputs/pkgs/project-plus/default.nix b/outputs/pkgs/project-plus/default.nix
index 629a689..eb756e3 100644
--- a/outputs/pkgs/project-plus/default.nix
+++ b/outputs/pkgs/project-plus/default.nix
@@ -1,8 +1,6 @@
 {
   fpp-config,
   userDir ? "/home/ooks/.config/project-plus",
-  fpp-sd,
-  fpp-launcher,
   lib,
   stdenv,
   fetchFromGitHub,
@@ -161,7 +159,7 @@ in
       cp Binaries/ $out/ -r
 
       mkdir -p $out/bin
-      ln -s $out/Binaries/ishiiruka $out/bin/project-plus
+      ln -s $out/Binaries/ishiiruka $out/bin/faster-project-plus
 
       runHook postInstall
     '';