From 91fbdd3ee2aa9aed769520fefc8c5a2b8a1db60a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Jan 2016 01:05:05 +0100 Subject: [PATCH] redshift: 1.10 -> 1.11 Changes: - Add option preserve for gamma adjustment methods (randr, vidmode, quartz, w32gdi) to apply redness on top of current gamma correction. - Fix #158: Add redshift.desktop file to resolve an issue where Geoclue2 would not allow redshift to obtain the current location. - Fix #263: Make sure that the child process is terminated when redshift-gtk exits. - Fix #284: A sample configuation file has been added to the distribution tarball. - Fix warning message in redshift-gtk that is some cases caused redshift-gtk to fail (#271) - Fix #174: Use nanosleep() for sleeping to avoid high CPU load on platforms (NetBSD, ...) with limitations in usleep() - Various updates to man page and translations. --- pkgs/applications/misc/redshift/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index ad2f5f74cce3..abe25afda5f7 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -7,18 +7,21 @@ }: let - version = "1.10"; - mkFlag = flag: name: if flag then "--enable-${name}" else "--disable-${name}"; + version = "1.11"; + mkFlag = flag: name: if flag + then "--enable-${name}" + else "--disable-${name}"; in stdenv.mkDerivation { name = "redshift-${version}"; src = fetchurl { - sha256 = "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv"; + sha256 = "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh"; url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"; }; buildInputs = [ geoclue2 ] - ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python pygobject3 pyxdg ] + ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python + pygobject3 pyxdg ] ++ stdenv.lib.optionals drmSupport [ libdrm ] ++ stdenv.lib.optionals randrSupport [ libxcb ] ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ]; @@ -31,6 +34,8 @@ stdenv.mkDerivation { (mkFlag vidModeSupport "vidmode") ]; + enableParallelBuilding = true; + preInstall = stdenv.lib.optionalString guiSupport '' substituteInPlace src/redshift-gtk/redshift-gtk \ --replace "/usr/bin/env python3" "${python}/bin/${python.executable}" @@ -41,6 +46,8 @@ stdenv.mkDerivation { --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share" + + install -Dm644 {.,$out/share/doc/redshift}/redshift.conf.sample ''; meta = with stdenv.lib; {