Merge pull request #40881 from hedning/flatpax-xdg-data-dirs

nixos/flatpak: add flatpak's XDG_DATA_DIRS to the environment
2018-05-22 13:55:38 -05:00
parent 0e35858252 17e0e67930
commit 009d4341d8
1 changed files with 5 additions and 5 deletions
--- a/nixos/modules/services/desktops/flatpak.nix
+++ b/nixos/modules/services/desktops/flatpak.nix
@@ -40,12 +40,12 @@ in {

    systemd.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;

-    environment.variables = {
-      PATH = [
-        "$HOME/.local/share/flatpak/exports/bin"
-        "/var/lib/flatpak/exports/bin"
-      ];
+    environment.profiles = [
+      "$HOME/.local/share/flatpak/exports"
+      "/var/lib/flatpak/exports"
+    ];

+    environment.variables = {
      XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals;
    };
  };