fix(desktop): only use one version of xdg-desktop-portal-hyprland
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
4927481b25
commit
4df69d9d50
1 changed files with 14 additions and 5 deletions
|
@ -42,11 +42,7 @@ in {
|
||||||
programs.hyprland = {
|
programs.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = hyprCfg.finalPackage;
|
package = hyprCfg.finalPackage;
|
||||||
portalPackage =
|
portalPackage = hyprCfg.finalPortalPackage;
|
||||||
hyprland
|
|
||||||
.packages
|
|
||||||
.${pkgs.system}
|
|
||||||
.xdg-desktop-portal-hyprland;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
|
@ -69,6 +65,13 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Make sure we only use the package from the hyprland flake
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
xdg-desktop-portal-hyprland = hyprCfg.finalPortalPackage;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
home-manager.users.${cfg.user} = {
|
home-manager.users.${cfg.user} = {
|
||||||
imports = [
|
imports = [
|
||||||
./home/dev.nix
|
./home/dev.nix
|
||||||
|
@ -92,6 +95,12 @@ in {
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
portalPackage =
|
||||||
|
hyprland
|
||||||
|
.packages
|
||||||
|
.${pkgs.system}
|
||||||
|
.xdg-desktop-portal-hyprland;
|
||||||
|
|
||||||
systemd.variables = ["-all"];
|
systemd.variables = ["-all"];
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
|
|
Loading…
Add table
Reference in a new issue