public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68285 from rileyinman/redshift-wlr

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/applications/misc/redshift/default.nix
View File

@ -11,16 +11,11 @@
, withGeoclue ? withGeolocation && stdenv.isLinux, geoclue , withGeoclue ? withGeolocation && stdenv.isLinux, geoclue
}: }:
let
mkRedshift =
{ pname, version, src, meta }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "redshift"; inherit pname version src meta;
version = "1.12";
src = fetchFromGitHub {
owner = "jonls";
repo = "redshift";
rev = "v${version}";
sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6";
};
patches = [ patches = [
# https://github.com/jonls/redshift/pull/575 # https://github.com/jonls/redshift/pull/575
@ -73,6 +68,19 @@ stdenv.mkDerivation rec {
''; '';
enableParallelBuilding = true; 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; { meta = with stdenv.lib; {
description = "Screen color temperature manager"; description = "Screen color temperature manager";
@ -89,4 +97,22 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ yegortimoshenko globin ]; 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;
};
};
} }

4
pkgs/top-level/all-packages.nix
View File

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