refactor(gsr): move subpackages to passthru of gpu-screen-recorder

This commit is contained in:
matt1432 2025-05-11 20:31:43 -04:00
parent a968790bec
commit 93b4c7149b
4 changed files with 42 additions and 24 deletions
configurations/binto/modules/gpu-replay
packages

View file

@ -6,7 +6,7 @@
... ...
}: let }: let
inherit (lib) concatStringsSep getExe removePrefix; inherit (lib) concatStringsSep getExe removePrefix;
inherit (pkgs.selfPackages) gpu-screen-recorder gsr-kms-server gsr-dbus-server; inherit (pkgs.selfPackages) gpu-screen-recorder;
hyprPkgs = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage; hyprPkgs = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
@ -24,7 +24,7 @@ in {
owner = "root"; owner = "root";
group = "video"; group = "video";
capabilities = "cap_sys_admin+ep"; capabilities = "cap_sys_admin+ep";
source = getExe gsr-kms-server; source = getExe gpu-screen-recorder.gsr-kms-server;
}; };
}; };
@ -47,7 +47,7 @@ in {
pkgs.pulseaudio pkgs.pulseaudio
pkgs.xorg.xrandr pkgs.xorg.xrandr
gsr-dbus-server gpu-screen-recorder.gsr-dbus-server
hyprPkgs hyprPkgs
]; ];

View file

@ -6,13 +6,7 @@
selfPackages = { selfPackages = {
coloryou = final.python3Packages.callPackage ./coloryou {}; coloryou = final.python3Packages.callPackage ./coloryou {};
gpu-screen-recorder = final.callPackage ./gpu-screen-recorder/gpu-screen-recorder.nix { gpu-screen-recorder = final.callPackage ./gpu-screen-recorder {
inherit (inputs) gpu-screen-recorder-src;
};
gsr-kms-server = final.callPackage ./gpu-screen-recorder/gsr-kms-server.nix {
inherit (inputs) gpu-screen-recorder-src;
};
gsr-dbus-server = final.callPackage ./gpu-screen-recorder/gsr-dbus-server.nix {
inherit (inputs) gpu-screen-recorder-src; inherit (inputs) gpu-screen-recorder-src;
}; };

View file

@ -0,0 +1,24 @@
{
callPackage,
gpu-screen-recorder-src,
...
}: let
gpu-screen-recorder = callPackage ./gpu-screen-recorder.nix {
inherit gpu-screen-recorder-src;
};
gsr-kms-server = callPackage ./gsr-kms-server.nix {
inherit gpu-screen-recorder-src;
};
gsr-dbus-server = callPackage ./gsr-dbus-server.nix {
inherit gpu-screen-recorder-src;
};
in
gpu-screen-recorder.overrideAttrs (o: {
passthru =
o.passthru or {}
// {
inherit gsr-kms-server gsr-dbus-server;
};
})

View file

@ -94,20 +94,20 @@ in
# to get the security wrapper # to get the security wrapper
postFixup = postFixup =
optionalString (pname == "gsr-kms-server") optionalString (pname == "gsr-kms-server")
# bash # bash
'' ''
rm $out/bin/{gpu-screen-recorder,gsr-dbus-server} rm $out/bin/{gpu-screen-recorder,gsr-dbus-server}
'' + ''
optionalString (pname == "gpu-screen-recorder") + optionalString (pname == "gpu-screen-recorder")
# bash # bash
'' ''
rm $out/bin/{gsr-kms-server,gsr-dbus-server} rm $out/bin/{gsr-kms-server,gsr-dbus-server}
'' + ''
optionalString (pname == "gsr-dbus-server") + optionalString (pname == "gsr-dbus-server")
# bash # bash
'' ''
rm $out/bin/{gpu-screen-recorder,gsr-kms-server} rm $out/bin/{gpu-screen-recorder,gsr-kms-server}
''; '';
meta = { meta = {
mainProgram = pname; mainProgram = pname;