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

redshift: update to 1.8 and fix redshift-gtk script

Browse Source
This commit is contained in:
Rok Garbas 2013-10-26 19:15:57 +02:00
parent e1c9c133b0
commit ff8e06d4cc
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,34 @@
{ fetchurl, stdenv, { fetchurl, stdenv, libX11, libXrandr, libXxf86vm, libxcb, pkgconfig, python
libX11, libXrandr, libXxf86vm, libxcb, pkgconfig, python, , randrproto, xcbutil, xf86vidmodeproto, autoconf, automake, gettext, glib
randrproto, xcbutil, xf86vidmodeproto }: , GConf, dbus, dbus_glib, makeWrapper, gtk, pygtk, pyxdg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "redshift"; version = "1.8";
version = "1.7"; name = "redshift-${version}";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "http://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; url = "https://github.com/jonls/redshift/archive/v${version}.tar.gz";
sha256 = "1j0hs0vnlic90cf4bryn11n4ani1x2s5l8z6ll3fmrlw98ykrylv"; sha256 = "1srj2dwy32h71iqikb4ysv5ipclym80i9lys2ns8vjmclg7hj3vi";
}; };
buildInputs = [ libX11 libXrandr libXxf86vm libxcb pkgconfig python buildInputs = [
randrproto xcbutil xf86vidmodeproto ]; libX11 libXrandr libXxf86vm libxcb pkgconfig python randrproto xcbutil
xf86vidmodeproto autoconf automake gettext glib GConf dbus dbus_glib
makeWrapper gtk pygtk pyxdg
# TODO:
# geoclue
];
preConfigure = ''
./bootstrap
'';
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 = { meta = {
description = "changes the color temperature of your screen gradually"; description = "changes the color temperature of your screen gradually";

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

@ -9603,6 +9603,8 @@ let
redshift = callPackage ../applications/misc/redshift { redshift = callPackage ../applications/misc/redshift {
inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm
xf86vidmodeproto; xf86vidmodeproto;
inherit (gnome) GConf;
inherit (pythonPackages) pyxdg;
}; };
oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { }; oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { };