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

Merge pull request #18824 from aske/xflux-gui

Browse Source 
xflux-gui: 2016-08-08 -> 2016-09-21, fix icon display
This commit is contained in:
Luca Bruno 2016-09-22 21:45:31 +01:00 committed by GitHub
commit 19dc2ff732
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/tools/misc/xflux/gui.nix
View File

@ -1,22 +1,17 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, { stdenv, fetchFromGitHub, buildPythonPackage
pexpect, , pexpect, pyGtkGlade, pygobject, pyxdg
pyGtkGlade, , gnome_python, python
pygobject, , libappindicator-gtk2, xflux, librsvg, wrapGAppsHook
pyxdg,
gnome_python,
libappindicator-gtk2,
xflux,
python
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "xflux-gui-${version}"; name = "xflux-gui-${version}";
version = "2016-08-08"; version = "2016-09-21";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "xflux-gui"; repo = "xflux-gui";
owner = "xflux-gui"; owner = "xflux-gui";
rev = "4125e70b6ad0aeda7de46b3a7083a26c392555dc"; rev = "0b56204477494b473a390e8b0db043437ec14f32";
sha256 = "1l56f59hnjyi7nn8wn3dfdx6lw2qjbrhdlcfz0qvwj6b0953f2s7"; sha256 = "15pr8f31jnhqjlpvasnj6cmm6hw5gljphh2pxzav3zd9bp4yl56r";
}; };
# not sure if these need to be propagated or not? # not sure if these need to be propagated or not?
@ -29,15 +24,17 @@ buildPythonPackage rec {
gnome_python gnome_python
]; ];
buildInputs = [ buildInputs = [ xflux librsvg ];
xflux
]; nativeBuildInputs = [ wrapGAppsHook ];
postPatch = '' postPatch = ''
substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\"" substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\""
''; '';
postFixup = '' postFixup = ''
wrapGAppsHook
makeWrapperArgs="''${gappsWrapperArgs[@]}"
wrapPythonPrograms wrapPythonPrograms
patchPythonScript $out/${python.sitePackages}/fluxgui/fluxapp.py patchPythonScript $out/${python.sitePackages}/fluxgui/fluxapp.py
''; '';