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: 551eeb275764
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 97b87f1701de
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 27, 2019

  1. gnome3.gdm: fix rebuild switch 

    See: https://gitlab.gnome.org/GNOME/gdm/issues/515
    @worldofpeace
    worldofpeace committed Sep 27, 2019
    Copy the full SHA
    02f62a3 View commit details

  2. gnome3.gdm: Remove duplicate sessions when on Xorg

    @worldofpeace
    worldofpeace committed Sep 27, 2019
    Copy the full SHA
    6f3cc5f View commit details

  3. gnome3.gnome-session: fix debug spam with systemd session

    @worldofpeace
    worldofpeace committed Sep 27, 2019
    Copy the full SHA
    9dd8c9c View commit details

  4. nixos/gnome3: use sessionVariables 

    Without this GNOME_SESSION_DEBUG
likely won't be set in the systemd user environment.
    @worldofpeace
    worldofpeace committed Sep 27, 2019
    Copy the full SHA
    97b87f1 View commit details
8 changes: 4 additions & 4 deletions nixos/modules/services/x11/desktop-managers/gnome3.nix
View file
Original file line number Diff line number Diff line change
@@ -155,10 +155,10 @@ in

environment.systemPackages = cfg.sessionPath;

environment.variables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";

# Override GSettings schemas
environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

# If gnome3 is installed, build vim for gtk3 too.
nixpkgs.config.vim.gui = "gtk3";
@@ -351,10 +351,10 @@ in

# Let nautilus find extensions
# TODO: Create nautilus-with-extensions package
environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";

# Override default mimeapps for nautilus
environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
environment.sessionVariables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];

environment.pathsToLink = [
"/share/nautilus-python/extensions"
14 changes: 13 additions & 1 deletion pkgs/desktops/gnome-3/core/gdm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
, accountsservice, libX11, gnome3, systemd, autoreconfHook
, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
, librsvg, coreutils, xwayland, nixos-icons }:
, librsvg, coreutils, xwayland, nixos-icons, fetchpatch }:

let

@@ -51,6 +51,18 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

patches = [
# See: https://gitlab.gnome.org/GNOME/gdm/issues/515
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gdm/commit/0e05e2fd3c2a3b28ed4db0e51e4646aa6af67a5f.patch";
sha256 = "10kbjn0kis0xf95dfzq4w6xazyfbcz8yj9lrixg5jb3srrnp0hhf";
})

# https://gitlab.gnome.org/GNOME/gdm/merge_requests/84
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gdm/commit/2136c3baab81b6ec2115180f67ada91727e948f7.patch";
sha256 = "1ispxh4p6hdh3bx9x86497gzlwpgj32x2ymmv60wafg76vmrlcc2";
})

# Change hardcoded paths to nix store paths.
(substituteAll {
src = ./fix-paths.patch;
13 changes: 12 additions & 1 deletion pkgs/desktops/gnome-3/core/gnome-session/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, fetchpatch }:

stdenv.mkDerivation rec {
pname = "gnome-session";
@@ -12,6 +12,17 @@ stdenv.mkDerivation rec {
};

patches = [
# Fix debug spam when using systemd session
# https://gitlab.gnome.org/GNOME/gnome-session/issues/31
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/adfdf7f64f08fc07325f9332e9eba46974cc30ee.patch";
sha256 = "0vjg77gpj3k63a5ffhsvv5m30lbj6cab35lhl4gpqxg4j2j3yy7y";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/b7b24627485c520f873db4e918e217a76ededd8c.patch";
sha256 = "1d8pw8q423wvv0cd32p0yf52vlfj7w1if2gljqvarcm2n1m0pdxj";
})

(substituteAll {
src = ./fix-paths.patch;
gsettings = "${glib.bin}/bin/gsettings";