From f54a02df4f1ecca724a4737b936e100e92ed4743 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Wed, 7 Mar 2018 23:00:48 -0800 Subject: [PATCH] light-locker: 1.7.0 -> 1.8.0 --- pkgs/misc/screensavers/light-locker/default.nix | 7 ++----- pkgs/misc/screensavers/light-locker/systemd.patch | 13 ------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/misc/screensavers/light-locker/systemd.patch diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index d081581d2552..f38851d6fa0c 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -16,18 +16,15 @@ stdenv.mkDerivation rec { name = "${basename}-${version}"; basename = "light-locker"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "the-cavalry"; repo = basename; rev = "v${version}"; - sha256 = "0ygkp5vgkx2nfhfql6j2jsfay394gda23ir3sx4f72j4agsirjvj"; + sha256 = "1zsafc10bmliknf12h3mgy7f73lvgph0q0wkaqp42iagmw11yaj8"; }; - # Patch so that systemd is "found" when configuring. - patches = [ ./systemd.patch ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ which xfce.xfce4-dev-tools glib systemd libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ]; diff --git a/pkgs/misc/screensavers/light-locker/systemd.patch b/pkgs/misc/screensavers/light-locker/systemd.patch deleted file mode 100644 index 9cba8b9c0d2f..000000000000 --- a/pkgs/misc/screensavers/light-locker/systemd.patch +++ /dev/null @@ -1,13 +0,0 @@ -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