From 26463d07368df63a638e6f5ad63fd0e663c5b8f1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 18 Apr 2019 08:28:45 -0400
Subject: [PATCH] lightlocker: 1.8.0 -> 1.9.0

* meson!
* enabled UPower functionality

https://github.com/the-cavalry/light-locker/releases/tag/v1.9.0
---
 .../screensavers/light-locker/default.nix     | 67 ++++++++++++-------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix
index f38851d6fa0c..dc3f87b1f2be 100644
--- a/pkgs/misc/screensavers/light-locker/default.nix
+++ b/pkgs/misc/screensavers/light-locker/default.nix
@@ -1,43 +1,64 @@
 { stdenv
 , fetchFromGitHub
-, which
-, xfce
-, glib
+, meson
+, ninja
 , pkgconfig
+, gtk3
+, glib
+, intltool
+, dbus-glib
 , libX11
 , libXScrnSaver
-, libXxf86misc
-, gtk3
-, dbus-glib
+, libXxf86vm
+, libXext
 , systemd
+, pantheon
 , wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
-  name = "${basename}-${version}";
-  basename = "light-locker";
-  version = "1.8.0";
+  pname = "light-locker";
+  version = "1.9.0";
+
+  outputs = [ "out" "man" ];
 
   src = fetchFromGitHub {
     owner = "the-cavalry";
-    repo = basename;
+    repo = pname;
     rev = "v${version}";
-    sha256 = "1zsafc10bmliknf12h3mgy7f73lvgph0q0wkaqp42iagmw11yaj8";
+    sha256 = "1z5lcd02gqax65qc14hj5khifg7gr53zy3s5i6apba50lbdlfk46";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which xfce.xfce4-dev-tools glib systemd
-                  libX11 libXScrnSaver libXxf86misc gtk3 dbus-glib wrapGAppsHook ];
+  nativeBuildInputs = [
+    intltool
+    meson
+    ninja
+    pkgconfig
+  ];
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
+  buildInputs = [
+    dbus-glib
+    glib
+    gtk3
+    libX11
+    libXScrnSaver
+    libXext
+    libXxf86vm
+    systemd
+    wrapGAppsHook
+  ];
 
-  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" ];
+  mesonFlags = [
+    "-Dmit-ext=true"
+    "-Ddpms-ext=true"
+    "-Dxf86gamma-ext=true"
+    "-Dsystemd=true"
+    "-Dupower=true"
+    "-Dlate-locking=true"
+    "-Dlock-on-suspend=true"
+    "-Dlock-on-lid=true"
+    "-Dgsettings=true"
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/the-cavalry/light-locker;
@@ -52,7 +73,7 @@ stdenv.mkDerivation rec {
       ConsoleKit/UPower or logind/systemd.
     '';
     license = licenses.gpl2;
-    maintainers = with maintainers; [ obadz ];
+    maintainers = with maintainers; [ obadz ] ++ pantheon.maintainers;
     platforms = platforms.linux;
   };
 }