ooks/ooknet
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

project-plus: remove sd and launcher from derivation

Browse source
This commit is contained in:
ooks-io 2025-01-11 20:19:23 +11:00
parent 5aae9cdf5d
commit 4191eb50bf
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
outputs/pkgs/default.nix
View file

@ -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;
};
};
}

4
outputs/pkgs/project-plus/default.nix
View file

@ -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
'';