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: 7aa1dd4004db
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9055b33db045
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 14, 2019

  1. lightdm: disable writing dmrc files to home 

    Can cause issues where lightdm prefers the last saved session in .dmrc
even if it doesn't exist anymore, preventing people from logging in to
a session.

(cherry picked from commit 44298e7)
This can prevent people from starting a session and we don't want that
to happen to anyone using stable.
    @worldofpeace
    worldofpeace committed Mar 14, 2019
    Copy the full SHA
    9055b33 View commit details
Showing with 12 additions and 4 deletions.
  1. +12 −4 pkgs/applications/display-managers/lightdm/default.nix
16 changes: 12 additions & 4 deletions pkgs/applications/display-managers/lightdm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pam, pkgconfig, autoconf, automake, libtool, libxcb
, glib, libXdmcp, itstool, intltool, libxklavier, libgcrypt, audit, busybox
, polkit, accountsservice, gtk-doc, gnome3, gobject-introspection, vala
, polkit, accountsservice, gtk-doc, gnome3, gobject-introspection, vala, fetchpatch
, withQt4 ? false, qt4
, withQt5 ? false, qtbase
}:
@@ -49,7 +49,14 @@ stdenv.mkDerivation rec {
] ++ optional withQt4 qt4
++ optional withQt5 qtbase;

patches = [ ./run-dir.patch ];
patches = [
./run-dir.patch
# Adds option to disable writing dmrc files
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/lightdm/raw/4cf0d2bed8d1c68970b0322ccd5dbbbb7a0b12bc/f/lightdm-1.25.1-disable_dmrc.patch";
sha256 = "06f7iabagrsiws2l75sx2jyljknr9js7ydn151p3qfi104d1541n";
})
];

preConfigure = "NOCONFIGURE=1 ./autogen.sh";

@@ -58,11 +65,12 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc"
"--disable-tests"
"--disable-static"
"--disable-dmrc"
] ++ optional withQt4 "--enable-liblightdm-qt"
++ optional withQt5 "--enable-liblightdm-qt5";

installFlags = [
"sysconfdir=\${out}/etc"
"sysconfdir=${placeholder ''out''}/etc"
"localstatedir=\${TMPDIR}"
];

@@ -76,7 +84,7 @@ stdenv.mkDerivation rec {

meta = {
homepage = https://github.com/CanonicalLtd/lightdm;
description = "A cross-desktop display manager.";
description = "A cross-desktop display manager";
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = with maintainers; [ ocharles worldofpeace ];