Merge pull request #184454 from NixOS/lightdm

This commit is contained in:
Sandro 2022-08-04 15:05:13 +02:00 committed by GitHub
commit c70ac648b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 55 deletions

View File

@ -158,7 +158,7 @@ in
config = mkIf (ldmcfg.enable && cfg.enable) {
services.xserver.displayManager.lightdm.greeter = mkDefault {
package = pkgs.lightdm_gtk_greeter.xgreeters;
package = pkgs.lightdm-gtk-greeter.xgreeters;
name = "lightdm-gtk-greeter";
};

View File

@ -25,8 +25,6 @@
, gobject-introspection
, vala
, fetchpatch
, withQt4 ? false
, qt4
, withQt5 ? false
, qtbase
, yelp-tools
@ -36,15 +34,15 @@ with lib;
stdenv.mkDerivation rec {
pname = "lightdm";
version = "1.30.0";
version = "1.32.0";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "CanonicalLtd";
owner = "canonical";
repo = pname;
rev = version;
sha256 = "0i1yygmjbkdjnqdl9jn8zsa1mfs2l19qc4k2capd8q1ndhnjm2dx";
sha256 = "sha256-ttNlhWD0Ran4d3QvZ+PxbFbSUGMkfrRm+hJdQxIDJvM=";
};
nativeBuildInputs = [
@ -71,8 +69,7 @@ stdenv.mkDerivation rec {
libxklavier
pam
polkit
] ++ optional withQt4 qt4
++ optional withQt5 qtbase;
] ++ optional withQt5 qtbase;
patches = [
# Adds option to disable writing dmrc files
@ -81,18 +78,6 @@ stdenv.mkDerivation rec {
sha256 = "06f7iabagrsiws2l75sx2jyljknr9js7ydn151p3qfi104d1541n";
})
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://github.com/canonical/lightdm/commit/a99376f5f51aa147aaf81287d7ce70db76022c47.patch";
sha256 = "1zyx1qqajrmqcf9hbsapd39gmdanswd9l78rq7q6rdy4692il3yn";
})
# https://github.com/canonical/lightdm/pull/104
(fetchpatch {
url = "https://github.com/canonical/lightdm/commit/03f218981733e50d810767f9d04e42ee156f7feb.patch";
sha256 = "07w18m2gpk29z6ym4y3lzsmg5dk3ffn39sq6lac26ap7narf4ma7";
})
# Hardcode plymouth to fix transitions.
# For some reason it can't find `plymouth`
# even when it's in PATH in environment.systemPackages.
@ -111,8 +96,7 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc"
"--disable-tests"
"--disable-dmrc"
] ++ optional withQt4 "--enable-liblightdm-qt"
++ optional withQt5 "--enable-liblightdm-qt5";
] ++ optional withQt5 "--enable-liblightdm-qt5";
installFlags = [
"sysconfdir=${placeholder "out"}/etc"
@ -139,7 +123,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/CanonicalLtd/lightdm";
homepage = "https://github.com/canonical/lightdm";
description = "A cross-desktop display manager";
platforms = platforms.linux;
license = licenses.gpl3;

View File

@ -1,60 +1,54 @@
{ lib, stdenv
, lightdm_gtk_greeter
{ stdenv
, lib
, lightdm-gtk-greeter
, fetchurl
, lightdm
, pkg-config
, intltool
, linkFarm
, wrapGAppsHook
, useGTK2 ? false
, gtk2
, gtk3 # gtk3 seems better supported
, gtk3
, xfce4-dev-tools
, at-spi2-core
, librsvg
, hicolor-icon-theme
}:
#ToDo: bad icons with gtk2;
# avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from
let
ver_branch = "2.0";
version = "2.0.7";
in
stdenv.mkDerivation rec {
pname = "lightdm-gtk-greeter";
inherit version;
version = "2.0.8";
src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms";
# Release tarball differs from source tarball.
url = "https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-${version}/lightdm-gtk-greeter-${version}.tar.gz";
sha256 = "vvuzAMezT/IYZf28iBIB9zD8fFYOngHRfomelHcVBhM=";
};
nativeBuildInputs = [ pkg-config intltool xfce4-dev-tools wrapGAppsHook ];
buildInputs = [ lightdm librsvg hicolor-icon-theme ]
++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
nativeBuildInputs = [
pkg-config
intltool
xfce4-dev-tools
wrapGAppsHook
];
buildInputs = [
lightdm
librsvg
hicolor-icon-theme
gtk3
];
configureFlags = [
"--localstatedir=/var"
"--sysconfdir=/etc"
"--disable-indicator-services-command"
"--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically
] ++ lib.optional useGTK2 "--with-gtk2";
postPatch = ''
# exo-csource has been dropped from exo, and replaced by xdt-csource from xfce4-dev-tools
for f in configure.ac src/Makefile.am; do
substituteInPlace $f --replace exo-csource xdt-csource
done
'';
];
preConfigure = ''
configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" )
'';
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
installFlags = [
"localstatedir=\${TMPDIR}"
"sysconfdir=${placeholder "out"}/etc"
@ -66,14 +60,15 @@ stdenv.mkDerivation rec {
'';
passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{
path = "${lightdm_gtk_greeter}/share/xgreeters/lightdm-gtk-greeter.desktop";
path = "${lightdm-gtk-greeter}/share/xgreeters/lightdm-gtk-greeter.desktop";
name = "lightdm-gtk-greeter.desktop";
}];
meta = with lib; {
homepage = "https://launchpad.net/lightdm-gtk-greeter";
homepage = "https://github.com/Xubuntu/lightdm-gtk-greeter";
description = "A GTK greeter for LightDM";
platforms = platforms.linux;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ bobby285271 ];
};
}

View File

@ -754,6 +754,7 @@ mapAliases ({
libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22
libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22
libwnck3 = libwnck;
lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
lighthouse = throw "lighthouse has been removed: abandoned by upstream"; # Added 2022-04-24
lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15
lilypond-unstable = lilypond; # Added 2021-03-11

View File

@ -30403,7 +30403,7 @@ with pkgs;
inherit (xorg) libX11 libXdmcp libpthreadstubs;
};
lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix {
lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix {
inherit (xfce) xfce4-dev-tools;
};