Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 68b3bff32da3
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2aead2422f85
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Aug 14, 2019

  1. flatpak: clear GDK_PIXBUF_MODULE_FILE 

    GDK_PIXBUF_MODULE_FILE is often set to a nix store path not available in a app
sandbox. This can cause some apps to fail launching, simply reset this env var
when running applications.

fixes NixOS/nixpkgs#53441

(cherry picked from commit 752e176)
(cherry picked from commit be89fd6)
    @hedning @matthewbauer
    hedning authored and matthewbauer committed Aug 14, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e823132 View commit details

  2. environment.profiles: fix order of profiles 

    This change is needed because the order of profiles correlate to the
order in PATH, therefore "/etc/profiles/per-user/$USER" always appeared
after the system packages directories.

(cherry picked from commit 33c834f)
    @Gerschtli @matthewbauer
    Gerschtli authored and matthewbauer committed Aug 14, 2019
    Copy the full SHA
    2aead24 View commit details
5 changes: 4 additions & 1 deletion nixos/modules/config/users-groups.nix
View file
Original file line number Diff line number Diff line change
@@ -564,7 +564,10 @@ in {
};
}) (filterAttrs (_: u: u.packages != []) cfg.users));

environment.profiles = [ "/etc/profiles/per-user/$USER" ];
environment.profiles = [
"$HOME/.nix-profile"
"/etc/profiles/per-user/$USER"
];

assertions = [
{ assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);
5 changes: 2 additions & 3 deletions nixos/modules/programs/environment.nix
View file
Original file line number Diff line number Diff line change
@@ -23,9 +23,8 @@ in
XCURSOR_PATH = [ "$HOME/.icons" ];
};

environment.profiles =
[ "$HOME/.nix-profile"
"/nix/var/nix/profiles/default"
environment.profiles = mkAfter
[ "/nix/var/nix/profiles/default"
"/run/current-system/sw"
];

1 change: 1 addition & 0 deletions pkgs/development/libraries/flatpak/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@ in stdenv.mkDerivation rec {
# patch taken from gtk_doc
./respect-xml-catalog-files-var.patch
./use-flatpak-from-path.patch
./unset-env-vars.patch
];

nativeBuildInputs = [
10 changes: 10 additions & 0 deletions pkgs/development/libraries/flatpak/unset-env-vars.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -1192,6 +1192,7 @@ static const ExportData default_exports[] = {
{"PERLLIB", NULL},
{"PERL5LIB", NULL},
{"XCURSOR_PATH", NULL},
+ {"GDK_PIXBUF_MODULE_FILE", NULL},
};

static const ExportData no_ld_so_cache_exports[] = {