From 79415b0bf6503a009c29b12943452404e0d54439 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 2 Aug 2020 17:53:33 +0000 Subject: [PATCH] gammastep: init at 2.0.1 Note: Since Gammastep is a fork of Redshift the mkRedshift will be reused as long as they don't diverge too far. Also: Gammastep should eventually replace redshift-wlr. --- pkgs/applications/misc/redshift/default.nix | 37 +++++++++++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index faa915383021..a95e5226f9bd 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool +{ stdenv, fetchFromGitHub, fetchFromGitLab +, autoconf, automake, gettext, intltool , libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection , gtk3, python, pygobject3, pyxdg @@ -18,11 +19,16 @@ let stdenv.mkDerivation rec { inherit pname version src meta; - patches = [ + patches = stdenv.lib.optionals (pname != "gammastep") [ # https://github.com/jonls/redshift/pull/575 ./575.patch ]; + postPatch = stdenv.lib.optionalString (pname == "gammastep") '' + substituteInPlace configure.ac \ + --replace "[gammastep], [2.0]" "[gammastep], [${version}]" + ''; + nativeBuildInputs = [ autoconf automake @@ -62,7 +68,12 @@ let # the geoclue agent may inspect these paths and expect them to be # valid without having the correct $PATH set - postInstall = '' + postInstall = if (pname == "gammastep") then '' + substituteInPlace $out/share/applications/gammastep.desktop \ + --replace 'Exec=gammastep' "Exec=$out/bin/gammastep" + substituteInPlace $out/share/applications/gammastep-indicator.desktop \ + --replace 'Exec=gammastep-indicator' "Exec=$out/bin/gammastep-indicator" + '' else '' substituteInPlace $out/share/applications/redshift.desktop \ --replace 'Exec=redshift' "Exec=$out/bin/redshift" substituteInPlace $out/share/applications/redshift-gtk.desktop \ @@ -118,4 +129,24 @@ rec { homepage = "https://github.com/minus7/redshift"; }; }; + + gammastep = mkRedshift rec { + pname = "gammastep"; + version = "2.0.1"; + + src = fetchFromGitLab { + owner = "chinstrap"; + repo = pname; + rev = "v${version}"; + sha256 = "1ky4h892sg2mfbwwq5xv0vnjflsl2x3nsy5q456r1kyk1gwkj0rg"; + }; + + meta = redshift.meta // { + name = "${pname}-${version}"; + longDescription = "Gammastep" + + stdenv.lib.removePrefix "Redshift" redshift.meta.longDescription; + homepage = "https://gitlab.com/chinstrap/gammastep"; + maintainers = [ stdenv.lib.maintainers.primeos ] ++ redshift.meta.maintainers; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6d406907ac6..aef0a27b63d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24949,7 +24949,7 @@ in inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; geoclue = geoclue2; - }) redshift redshift-wlr; + }) redshift redshift-wlr gammastep; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };