diff options
| author | Kirill Boltaev <aske@fmap.me> | 2016-09-13 09:10:43 +0400 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-13 07:10:43 +0200 |
| commit | ac65abad0c7a51ed1c6186d52d46d51388291008 (patch) | |
| tree | e0139cc4d580825e1c678923511a1c1e1d00204f /pkgs/tools/misc/xflux/gui.nix | |
| parent | b76badd21b6a90946883a4f48b28f0358f40d6a0 (diff) | |
| download | nixpkgs-ac65abad0c7a51ed1c6186d52d46d51388291008.tar nixpkgs-ac65abad0c7a51ed1c6186d52d46d51388291008.tar.gz nixpkgs-ac65abad0c7a51ed1c6186d52d46d51388291008.tar.bz2 nixpkgs-ac65abad0c7a51ed1c6186d52d46d51388291008.tar.lz nixpkgs-ac65abad0c7a51ed1c6186d52d46d51388291008.tar.xz nixpkgs-ac65abad0c7a51ed1c6186d52d46d51388291008.tar.zst nixpkgs-ac65abad0c7a51ed1c6186d52d46d51388291008.zip | |
xflux-gui: 1.1.1 -> 2016-08-08 (#18489)
Also make it work with new python changes.
Diffstat (limited to 'pkgs/tools/misc/xflux/gui.nix')
| -rw-r--r-- | pkgs/tools/misc/xflux/gui.nix | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 0cf30942e73..8300c8ef30a 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,40 +1,45 @@ -{ stdenv, pkgs, fetchFromGitHub, buildPythonPackage, +{ stdenv, fetchFromGitHub, buildPythonPackage, pexpect, pyGtkGlade, pygobject, pyxdg, gnome_python, + libappindicator-gtk2, + xflux, + python }: buildPythonPackage rec { - version = "1.1.1"; name = "xflux-gui-${version}"; + version = "2016-08-08"; src = fetchFromGitHub { repo = "xflux-gui"; owner = "xflux-gui"; - rev = "d897dfd"; - sha256 = "1mx1r2hz3g3waafn4w8hql0gaasfizbzz60bk5llw007k4k8892r"; + rev = "4125e70b6ad0aeda7de46b3a7083a26c392555dc"; + sha256 = "1l56f59hnjyi7nn8wn3dfdx6lw2qjbrhdlcfz0qvwj6b0953f2s7"; }; - # remove messing with shipped binary - patches = [ ./setup.patch ]; - # not sure if these need to be propagated or not? propagatedBuildInputs = [ pexpect pyGtkGlade pygobject pyxdg - pkgs.libappindicator-gtk2 + libappindicator-gtk2 gnome_python ]; buildInputs = [ - pkgs.xflux + xflux ]; postPatch = '' - substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${pkgs.xflux}/bin/xflux\"" + substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\"" + ''; + + postFixup = '' + wrapPythonPrograms + patchPythonScript $out/${python.sitePackages}/fluxgui/fluxapp.py ''; meta = { |