diff options
author | Luca Bruno <lucabru@src.gnome.org> | 2016-09-22 21:45:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-22 21:45:31 +0100 |
commit | 19dc2ff73247cf9ebf3c4dc972c9a3340a0b304e (patch) | |
tree | 013cebfbf25feb8d130a7f6c6fe9c12bd29a6b9f /pkgs/tools | |
parent | c42c908f32751a877b72caaef7a2044d7c7a5880 (diff) | |
parent | c0a2fd0ecbba4c149ede61da58f24d42f89bcec6 (diff) | |
download | nixlib-19dc2ff73247cf9ebf3c4dc972c9a3340a0b304e.tar nixlib-19dc2ff73247cf9ebf3c4dc972c9a3340a0b304e.tar.gz nixlib-19dc2ff73247cf9ebf3c4dc972c9a3340a0b304e.tar.bz2 nixlib-19dc2ff73247cf9ebf3c4dc972c9a3340a0b304e.tar.lz nixlib-19dc2ff73247cf9ebf3c4dc972c9a3340a0b304e.tar.xz nixlib-19dc2ff73247cf9ebf3c4dc972c9a3340a0b304e.tar.zst nixlib-19dc2ff73247cf9ebf3c4dc972c9a3340a0b304e.zip |
Merge pull request #18824 from aske/xflux-gui
xflux-gui: 2016-08-08 -> 2016-09-21, fix icon display
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/xflux/gui.nix | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 8300c8ef30af..2b18d4e910d5 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, - pexpect, - pyGtkGlade, - pygobject, - pyxdg, - gnome_python, - libappindicator-gtk2, - xflux, - python +{ stdenv, fetchFromGitHub, buildPythonPackage +, pexpect, pyGtkGlade, pygobject, pyxdg +, gnome_python, python +, libappindicator-gtk2, xflux, librsvg, wrapGAppsHook }: buildPythonPackage rec { name = "xflux-gui-${version}"; - version = "2016-08-08"; + version = "2016-09-21"; src = fetchFromGitHub { repo = "xflux-gui"; owner = "xflux-gui"; - rev = "4125e70b6ad0aeda7de46b3a7083a26c392555dc"; - sha256 = "1l56f59hnjyi7nn8wn3dfdx6lw2qjbrhdlcfz0qvwj6b0953f2s7"; + rev = "0b56204477494b473a390e8b0db043437ec14f32"; + sha256 = "15pr8f31jnhqjlpvasnj6cmm6hw5gljphh2pxzav3zd9bp4yl56r"; }; # not sure if these need to be propagated or not? @@ -29,15 +24,17 @@ buildPythonPackage rec { gnome_python ]; - buildInputs = [ - xflux - ]; + buildInputs = [ xflux librsvg ]; + + nativeBuildInputs = [ wrapGAppsHook ]; postPatch = '' substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\"" ''; postFixup = '' + wrapGAppsHook + makeWrapperArgs="''${gappsWrapperArgs[@]}" wrapPythonPrograms patchPythonScript $out/${python.sitePackages}/fluxgui/fluxapp.py ''; |