HASH 4191eb50bf06
DATE 2025-01-11
SUBJECT project-plus: remove sd and launcher from derivation
FILES 2 CHANGED
HASH 4191eb50bf06
DATE 2025-01-11
SUBJECT project-plus: remove sd and launcher
from derivation
FILES 2 CHANGED
┌─ outputs/pkgs/default.nix ─────────────────────────────────────────────────┐
│ 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; │
│ }; │
│ }; │
│ } │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ outputs/pkgs/default.nix ───────────┐
│ diff --git a/outputs/pkgs/default.nix b/outp │
│ uts/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-pl │
│ us/fpp-config.nix {}; │
│ + fpp-launcher = callPackage ./project- │
│ plus/fpp-launcher.nix {}; │
│ + fpp-sd = callPackage ./project-plus/f │
│ pp-sd.nix {}; │
│ + package = qt6Packages.callPackage ./p │
│ roject-plus { │
│ + inherit (projectPlus) fpp-config; │
│ + }; │
│ + }; │
│ in { │
│ packages = { │
│ repopack = callPackage ./repopack {}; │
│ live-buds-cli = callPackage ./live-bu │
│ ds-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 {inhe │
│ rit inputs pkgs lib hozen;}; │
│ │
│ - project-plus = let │
│ - fpp-config = callPackage ./project- │
│ plus/fpp-config.nix {}; │
│ - fpp-launcher = callPackage ./projec │
│ t-plus/fpp-launcher.nix {}; │
│ - fpp-sd = callPackage ./project-plus │
│ /fpp-sd.nix {}; │
│ - in │
│ - qt6Packages.callPackage ./project-p │
│ lus { │
│ - inherit fpp-launcher fpp-sd fpp-c │
│ onfig; │
│ - }; │
│ + inherit (projectPlus) fpp-config fpp- │
│ launcher fpp-sd; │
│ + project-plus = projectPlus.package; │
│ }; │
│ }; │
│ } │
└──────────────────────────────────────────────┘
┌─ outputs/pkgs/project-plus/default.nix ────────────────────────────────────┐
│ diff --git a/outputs/pkgs/project-plus/default.nix b/outputs/pkgs/project-plus/def │
│ ault.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 │
│ ''; │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ ...pkgs/project-plus/default.nix ───┐
│ diff --git a/outputs/pkgs/project-plus/defau │
│ lt.nix b/outputs/pkgs/project-plus/default.n │
│ ix │
│ 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-plu │
│ s", │
│ - 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/bi │
│ n/project-plus │
│ + ln -s $out/Binaries/ishiiruka $out/bi │
│ n/faster-project-plus │
│ │
│ runHook postInstall │
│ ''; │
└──────────────────────────────────────────────┘
[ BACK TO LOG ]
──────────────────────────────────────────────────────────────────────────────────────
OOKNET
────────────────────────────────────────────────
OOKNET