From 50a44c44c407f9d24252392326a725ed08779d2d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 14 Dec 2020 16:03:05 +0100
Subject: gammastep: 2.0.5 -> 2.0.6

Switch from libappindicator to the newer libayatana-appindicator and
enable the optional systemd user unit and AppArmor support.
---
 pkgs/applications/misc/redshift/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'pkgs/applications/misc')

diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index a450b2e3eb77..4d0c168962f9 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -10,7 +10,7 @@
 , withGeolocation ? true
 , withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa
 , withGeoclue ? withGeolocation && stdenv.isLinux, geoclue
-, withAppIndicator ? true, libappindicator
+, withAppIndicator ? true, libappindicator, libayatana-appindicator
 }:
 
 let
@@ -41,6 +41,9 @@ let
         "--enable-drm=${if withDrm then "yes" else "no"}"
         "--enable-quartz=${if withQuartz then "yes" else "no"}"
         "--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
+      ] ++ stdenv.lib.optionals (pname == "gammastep") [
+        "--with-systemduserunitdir=${placeholder "out"}/share/systemd/user/"
+        "--enable-apparmor"
       ];
 
       buildInputs = [
@@ -52,7 +55,9 @@ let
         ++ stdenv.lib.optional  withDrm          libdrm
         ++ stdenv.lib.optional  withQuartz       ApplicationServices
         ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
-        ++ stdenv.lib.optional  withAppIndicator libappindicator
+        ++ stdenv.lib.optional  withAppIndicator (if (pname != "gammastep")
+             then libappindicator
+             else libayatana-appindicator)
         ;
 
       pythonPath = [ pygobject3 pyxdg ];
@@ -127,13 +132,13 @@ rec {
 
   gammastep = mkRedshift rec {
     pname = "gammastep";
-    version = "2.0.5";
+    version = "2.0.6";
 
     src = fetchFromGitLab {
       owner = "chinstrap";
       repo = pname;
       rev = "v${version}";
-      sha256 = "1l3x4gnichwzbb0529bhm723xpryn5svhhsfdiwlw122q1vmz2q7";
+      sha256 = "00s457yajnm7vq6jfanyri52pq000jbyjiy6wz2i3f0rq7cc01ya";
     };
 
     meta = redshift.meta // {
-- 
cgit v1.2.3