Revert "redshift: update 1.9.1 -> 1.10-git-20150222"

This reverts commit fb8308c4aff9ad86de3f2d850468cb5b4eacb43f.

Changed files
+11 -13
pkgs
applications
misc
redshift
top-level
+9 -13
pkgs/applications/misc/redshift/default.nix
···
-
{ fetchFromGitHub, 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";
name = "redshift-${version}";
-
src = fetchFromGitHub {
-
owner = "jonls";
-
repo = "redshift";
-
rev = "8b0a67a2538d7c79b74086caab07735fa97aa047";
-
sha256 = "0559ljri81iyig9j5i259nzb0z2ml37hhw5ppclcv6l25bzrkgip";
};
buildInputs = [
···
'';
preInstall = ''
-
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
'';
meta = with stdenv.lib; {
···
temperature transitions smoothly from night to daytime
temperature to allow your eyes to slowly adapt.
'';
-
license = licenses.gpl3Plus;
homepage = http://jonls.dk/redshift;
platforms = platforms.linux;
maintainers = [ maintainers.mornfall ];
-
};
}
···
+
{ 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.9.1";
name = "redshift-${version}";
+
src = fetchurl {
+
url = "https://github.com/jonls/redshift/archive/v${version}.tar.gz";
+
sha256 = "0rj7lyg4ikwpk1hr1k2bgk9gjqvvv51z8hydsgpx2k2lqdv6lqri";
};
buildInputs = [
···
'';
preInstall = ''
+
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
'';
meta = with stdenv.lib; {
···
temperature transitions smoothly from night to daytime
temperature to allow your eyes to slowly adapt.
'';
+
license = stdenv.lib.licenses.gpl3Plus;
homepage = http://jonls.dk/redshift;
platforms = platforms.linux;
maintainers = [ maintainers.mornfall ];
+
};
}
+2
pkgs/top-level/all-packages.nix
···
};
redshift = callPackage ../applications/misc/redshift {
inherit (gnome) GConf;
inherit (pythonPackages) pyxdg;
geoclue = geoclue2;
···
};
redshift = callPackage ../applications/misc/redshift {
+
inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm
+
xf86vidmodeproto;
inherit (gnome) GConf;
inherit (pythonPackages) pyxdg;
geoclue = geoclue2;