diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-10 12:57:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-10 12:57:19 -0500 |
| commit | 09f7e376c224993e82828766bf524f0b34ad312e (patch) | |
| tree | 61784455f0f29158fc189e8595d3ab37e83391d8 /nixos/modules/config | |
| parent | eaeb87add1ec31b3b088b65aa601b3c4f6d78e51 (diff) | |
| parent | e3cbebfc7c656c50e4506bcc5d21d909fad8c22f (diff) | |
Merge pull request #79416 from jtojnar/flatpak-1.6
flatpak: 1.4.2 → 1.6.1
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/xdg/portal.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 95fa8e05fa3f..1330a08070c1 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -42,6 +42,10 @@ with lib; let cfg = config.xdg.portal; packages = [ pkgs.xdg-desktop-portal ] ++ cfg.extraPortals; + joinedPortals = pkgs.symlinkJoin { + name = "xdg-portals"; + paths = cfg.extraPortals; + }; in mkIf cfg.enable { @@ -56,7 +60,7 @@ with lib; environment.variables = { GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1"; - XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals; + XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals"; }; }; } |