nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

light-locker: use systemd/logind instead of UPower

Browse Source 
Since systemd has been adopted for a while now, we should switch to
using it for light-locker as well. So I disabled ConsoleKit/UPower
support in favor of using systemd with logind. This fixed many issues
for me, and made light-locker working again.

I followed the PKGBUILD of Arch's package in determining the right
configure flags. See: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/light-locker
This commit is contained in:
Balletie 2016-12-18 18:20:29 +01:00
parent a66b703f94
commit 786b5dd07b
No known key found for this signature in database
GPG Key ID: A728847A61ACE466
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/misc/screensavers/light-locker/default.nix
View File

@ -5,6 +5,8 @@
, glib
, pkgconfig
, libX11
, libXScrnSaver
, libXxf86misc
, gtk3
, dbus_glib
, systemd
@ -23,18 +25,32 @@ stdenv.mkDerivation rec {
sha256 = "0ygkp5vgkx2nfhfql6j2jsfay394gda23ir3sx4f72j4agsirjvj";
};
buildInputs = [ which xfce.xfce4_dev_tools glib pkgconfig libX11 gtk3 dbus_glib systemd wrapGAppsHook ];
# Patch so that systemd is "found" when configuring.
patches = [ ./systemd.patch ];
buildInputs = [ which xfce.xfce4_dev_tools glib systemd pkgconfig
libX11 libXScrnSaver libXxf86misc gtk3 dbus_glib wrapGAppsHook ];
preConfigure = ''
./autogen.sh
'';
configureFlags = [ "--with-xf86gamma-ext" "--with-mit-ext"
"--with-dpms-ext" "--with-systemd"
# ConsoleKit and UPower were dropped in favor
# of systemd replacements
"--without-console-kit" "--without-upower" ];
meta = with stdenv.lib; {
homepage = https://github.com/the-cavalry/light-locker;
description = "Light-locker is a simple locker";
longDescription = ''
light-locker is a simple locker (forked from gnome-screensaver) that aims to have simple, sane, secure defaults and be well integrated with the desktop while not carrying any desktop-specific dependencies.
It relies on lightdm for locking and unlocking your session via ConsoleKit/UPower or logind/systemd.
light-locker is a simple locker (forked from gnome-screensaver)
that aims to have simple, sane, secure defaults and be well
integrated with the desktop while not carrying any
desktop-specific dependencies. It relies on lightdm for locking
and unlocking your session via ConsoleKit/UPower or
logind/systemd.
'';
license = licenses.gpl2;
maintainers = with maintainers; [ obadz ];

13
pkgs/misc/screensavers/light-locker/systemd.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/configure.ac.in b/configure.ac.in
index f7d5f5d..341bc83 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -424,7 +424,7 @@ AC_ARG_WITH(systemd,
[with_systemd=$withval], [with_systemd=auto])
PKG_CHECK_MODULES(SYSTEMD,
- [libsystemd-login],
+ [libsystemd],
[have_systemd=yes], [have_systemd=no])
if test "x$with_systemd" = "xauto" ; then