From 76e67b46b51c072de9783ad6148cc6b3b36260d6 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Thu, 9 Apr 2015 03:37:43 +0300
Subject: Revert "redshift: update 1.9.1 -> 1.10-git-20150222"

This reverts commit fb8308c4aff9ad86de3f2d850468cb5b4eacb43f.
---
 pkgs/applications/misc/redshift/default.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'pkgs/applications/misc')

diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 5d8e91764d4e8..6070c560815d0 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -1,15 +1,13 @@
-{ fetchFromGitHub, stdenv, libX11, libXrandr, libXxf86vm, libxcb, pkgconfig, python
+{ fetchurl, stdenv, libX11, libXrandr, libXxf86vm, libxcb, pkgconfig, python
 , randrproto, xcbutil, xf86vidmodeproto, autoconf, automake, gettext, glib
 , GConf, dbus, dbus_glib, makeWrapper, gtk, pygtk, pyxdg, geoclue }:
 
 stdenv.mkDerivation rec {
-  version = "1.10-git-20150222";
+  version = "1.9.1";
   name = "redshift-${version}";
-  src = fetchFromGitHub {
-    owner = "jonls";
-    repo  = "redshift";
-    rev   = "8b0a67a2538d7c79b74086caab07735fa97aa047";
-    sha256 = "0559ljri81iyig9j5i259nzb0z2ml37hhw5ppclcv6l25bzrkgip";
+  src = fetchurl {
+    url = "https://github.com/jonls/redshift/archive/v${version}.tar.gz";
+    sha256 = "0rj7lyg4ikwpk1hr1k2bgk9gjqvvv51z8hydsgpx2k2lqdv6lqri";
   };
 
   buildInputs = [
@@ -23,13 +21,11 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''
-    substituteInPlace src/redshift-gtk/redshift-gtk python \
-      --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
+    substituteInPlace src/redshift-gtk/redshift-gtk python --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
   '';
 
   postInstall = ''
-    wrapProgram "$out/bin/redshift-gtk" \
-      --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pyxdg}/lib/${python.libPrefix}/site-packages/pyxdg:$out/lib/${python.libPrefix}/site-packages
+    wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pyxdg}/lib/${python.libPrefix}/site-packages/pyxdg:$out/lib/${python.libPrefix}/site-packages
   '';
 
   meta = with stdenv.lib; {
@@ -41,9 +37,9 @@ stdenv.mkDerivation rec {
       temperature transitions smoothly from night to daytime
       temperature to allow your eyes to slowly adapt.
       '';
-    license = licenses.gpl3Plus;
+    license = stdenv.lib.licenses.gpl3Plus;
     homepage = http://jonls.dk/redshift;
     platforms = platforms.linux;
     maintainers = [ maintainers.mornfall ];
-  };
+  }; 
 }
-- 
cgit 1.4.1