Merge pull request #68285 from rileyinman/redshift-wlr

redshift-wlr: Init at 2019-04-17
This commit is contained in:
Linus Heckemann 2019-11-19 11:56:28 +01:00 committed by GitHub
commit 93e6dcb398
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 100 additions and 74 deletions

View file

@ -11,16 +11,11 @@
, withGeoclue ? withGeolocation && stdenv.isLinux, geoclue
}:
let
mkRedshift =
{ pname, version, src, meta }:
stdenv.mkDerivation rec {
pname = "redshift";
version = "1.12";
src = fetchFromGitHub {
owner = "jonls";
repo = "redshift";
rev = "v${version}";
sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6";
};
inherit pname version src meta;
patches = [
# https://github.com/jonls/redshift/pull/575
@ -73,6 +68,19 @@ stdenv.mkDerivation rec {
'';
enableParallelBuilding = true;
};
in
rec {
redshift = mkRedshift rec {
pname = "redshift";
version = "1.12";
src = fetchFromGitHub {
owner = "jonls";
repo = "redshift";
rev = "v${version}";
sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6";
};
meta = with stdenv.lib; {
description = "Screen color temperature manager";
@ -89,4 +97,22 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ yegortimoshenko globin ];
};
};
redshift-wlr = mkRedshift {
pname = "redshift-wlr";
version = "2019-04-17";
src = fetchFromGitHub {
owner = "minus7";
repo = "redshift";
rev = "eecbfedac48f827e96ad5e151de8f41f6cd3af66";
sha256 = "0rs9bxxrw4wscf4a8yl776a8g880m5gcm75q06yx2cn3lw2b7v22";
};
meta = redshift.meta // {
description = redshift.meta.description + "(with wlroots patches)";
homepage = https://github.com/minus7/redshift;
};
};
}

View file

@ -23373,11 +23373,11 @@ in
plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
redshift = callPackage ../applications/misc/redshift {
inherit (callPackages ../applications/misc/redshift {
inherit (python3Packages) python pygobject3 pyxdg wrapPython;
inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
geoclue = geoclue2;
};
}) redshift redshift-wlr;
redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };