Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0e3585825222
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 009d4341d80e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 22, 2018

  1. nixos/flatpak: add flatpak's XDG_DATA_DIRS to the environment 

    We use environment.profiles to add both the PATH and XDG_DATA_DIRS.
    @hedning
    hedning committed May 22, 2018
    Copy the full SHA
    17e0e67 View commit details

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

    nixos/flatpak: add flatpak's XDG_DATA_DIRS to the environment
    @matthewbauer
    matthewbauer authored May 22, 2018
    Copy the full SHA
    009d434 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 nixos/modules/services/desktops/flatpak.nix
10 changes: 5 additions & 5 deletions nixos/modules/services/desktops/flatpak.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
};