suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit fb8308c4af.
This commit is contained in:
Arseniy Seroka 2015-04-09 03:37:43 +03:00
parent 08bf6c93c5
commit 76e67b46b5
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 , randrproto, xcbutil, xf86vidmodeproto, autoconf, automake, gettext, glib
, GConf, dbus, dbus_glib, makeWrapper, gtk, pygtk, pyxdg, geoclue }: , GConf, dbus, dbus_glib, makeWrapper, gtk, pygtk, pyxdg, geoclue }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.10-git-20150222"; version = "1.9.1";
name = "redshift-${version}"; name = "redshift-${version}";
src = fetchFromGitHub { src = fetchurl {
owner = "jonls"; url = "https://github.com/jonls/redshift/archive/v${version}.tar.gz";
repo = "redshift"; sha256 = "0rj7lyg4ikwpk1hr1k2bgk9gjqvvv51z8hydsgpx2k2lqdv6lqri";
rev = "8b0a67a2538d7c79b74086caab07735fa97aa047";
sha256 = "0559ljri81iyig9j5i259nzb0z2ml37hhw5ppclcv6l25bzrkgip";
}; };
buildInputs = [ buildInputs = [
@ -23,13 +21,11 @@ stdenv.mkDerivation rec {
''; '';
preInstall = '' preInstall = ''
substituteInPlace src/redshift-gtk/redshift-gtk python \ substituteInPlace src/redshift-gtk/redshift-gtk python --replace "/usr/bin/env python" "${python}/bin/${python.executable}"
--replace "/usr/bin/env python" "${python}/bin/${python.executable}"
''; '';
postInstall = '' postInstall = ''
wrapProgram "$out/bin/redshift-gtk" \ 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
--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; { meta = with stdenv.lib; {
@ -41,9 +37,9 @@ stdenv.mkDerivation rec {
temperature transitions smoothly from night to daytime temperature transitions smoothly from night to daytime
temperature to allow your eyes to slowly adapt. temperature to allow your eyes to slowly adapt.
''; '';
license = licenses.gpl3Plus; license = stdenv.lib.licenses.gpl3Plus;
homepage = http://jonls.dk/redshift; homepage = http://jonls.dk/redshift;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.mornfall ]; maintainers = [ maintainers.mornfall ];
}; };
} }

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

@ -13186,6 +13186,8 @@ let
}; };
redshift = callPackage ../applications/misc/redshift { redshift = callPackage ../applications/misc/redshift {
inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm
xf86vidmodeproto;
inherit (gnome) GConf; inherit (gnome) GConf;
inherit (pythonPackages) pyxdg; inherit (pythonPackages) pyxdg;
geoclue = geoclue2; geoclue = geoclue2;