xflux-gui: 1.1.1 -> 2016-08-08 (#18489)

Also make it work with new python changes.

2 files changed, 15 insertions, 38 deletions

diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix
index 0cf30942e739..8300c8ef30af 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 = {
diff --git a/pkgs/tools/misc/xflux/setup.patch b/pkgs/tools/misc/xflux/setup.patch
deleted file mode 100644
index c36f81f7d808..000000000000
--- a/pkgs/tools/misc/xflux/setup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/setup.py b/setup.py
-index e11f199..b1cb0e5 100644
---- a/setup.py
-+++ b/setup.py
-@@ -4,13 +4,6 @@ from distutils.core import setup
- from sys import maxsize
- from os import rename
- 
--# Determines which is the appropriate executable for 32-bit
--if maxsize == 2147483647:
--    rename("xflux32", "xflux")
--# ... or 64-bit processors
--elif maxsize == 9223372036854775807:
--    rename("xflux64", "xflux")
--
- setup(name = "f.lux indicator applet",
-     version = "1.1.8",
-     description = "f.lux indicator applet - better lighting for your computer",
-@@ -22,8 +15,7 @@ setup(name = "f.lux indicator applet",
-     packages = ["fluxgui",],
-     package_data = {"fluxgui" : ["*.glade"] },
-     data_files=[('share/icons/hicolor/scalable/apps', ['fluxgui.svg', 'fluxgui-light.svg', 'fluxgui-dark.svg']),
--            ('share/applications', ['desktop/fluxgui.desktop']),
--            ('bin', ['xflux']),],
-+            ('share/applications', ['desktop/fluxgui.desktop']),],
-     scripts = ["fluxgui"],
-     long_description = """f.lux indicator applet is an indicator applet to
-     control xflux, an application that makes the color of your computer's