diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/applications/misc/redshift | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/redshift')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/redshift/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/misc/redshift/default.nix b/nixpkgs/pkgs/applications/misc/redshift/default.nix index 86c787df62aa..99d65eb090a7 100644 --- a/nixpkgs/pkgs/applications/misc/redshift/default.nix +++ b/nixpkgs/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 ? stdenv.isLinux, 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.2"; + version = "2.0.6"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "09wqlz3yya955galhs20014qfwm2yk0lxhyqdsw8gwddvcpyprzg"; + sha256 = "00s457yajnm7vq6jfanyri52pq000jbyjiy6wz2i3f0rq7cc01ya"; }; meta = redshift.meta // { |