From 2161856813a44889628d91b843540fbf9c5260b7 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 14 Jun 2018 20:20:48 -0700
Subject: [PATCH 1/2] udiskie: Add libappindicator-gtk3 runtime dependency

This is needed to support the --appindicator --tray command line flag.
---
 pkgs/applications/misc/udiskie/default.nix    |  9 +++++---
 .../python-modules/gbulb/default.nix          | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/gbulb/default.nix

diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index 1db0e4be1966e..f7d139026661b 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -1,10 +1,12 @@
 { stdenv, fetchFromGitHub, asciidoc-full, gettext
-, gobjectIntrospection, gtk3, hicolor-icon-theme, libnotify, librsvg
+, gobjectIntrospection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg
 , udisks2, wrapGAppsHook
 , buildPythonApplication
 , docopt
+, gbulb
 , pygobject3
 , pyyaml
+, wheel
 }:
 
 buildPythonApplication rec {
@@ -23,11 +25,12 @@ buildPythonApplication rec {
     hicolor-icon-theme
     wrapGAppsHook
     librsvg              # required for loading svg icons (udiskie uses svg icons)
+    wheel
   ];
 
   propagatedBuildInputs = [
-    gettext gobjectIntrospection gtk3 libnotify docopt
-    pygobject3 pyyaml udisks2
+    gettext gobjectIntrospection gtk3 libnotify docopt gbulb
+    pygobject3 pyyaml udisks2 libappindicator-gtk3
   ];
 
   postBuild = "make -C doc";
diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix
new file mode 100644
index 0000000000000..3fb1e9b0349a1
--- /dev/null
+++ b/pkgs/development/python-modules/gbulb/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pygobject3
+, gobjectIntrospection
+, gtk3
+}:
+
+buildPythonPackage rec {
+  version = "0.5.3";
+  pname = "gbulb";
+  name = "${pname}-${version}";
+
+  propagatedBuildInputs = [pygobject3 gobjectIntrospection gtk3];
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19byqicjgb68s2lgadmwsj4c5nw7lgvz88xl90d8rvnl5vd2zs80";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://flask.pocoo.org/;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5aea6571d2bed..50623fcdcca76 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -259,6 +259,8 @@ in {
 
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
 
+  gbulb = callPackage ../development/python-modules/gbulb { };
+
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };
 
   goocalendar = callPackage ../development/python-modules/goocalendar { };

From 57f8b4de6b89cf6215042178b4145e04506d40b6 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 14 Jun 2018 20:46:48 -0700
Subject: [PATCH 2/2] udiskie: Add libappindicator-gtk3 to runtime dependencies

This is needed to support the --appindicator --tray flag.
---
 pkgs/applications/misc/udiskie/default.nix    |  5 +----
 .../python-modules/gbulb/default.nix          | 22 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 pkgs/development/python-modules/gbulb/default.nix

diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index f7d139026661b..5b75fbbc08e10 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -3,10 +3,8 @@
 , udisks2, wrapGAppsHook
 , buildPythonApplication
 , docopt
-, gbulb
 , pygobject3
 , pyyaml
-, wheel
 }:
 
 buildPythonApplication rec {
@@ -25,11 +23,10 @@ buildPythonApplication rec {
     hicolor-icon-theme
     wrapGAppsHook
     librsvg              # required for loading svg icons (udiskie uses svg icons)
-    wheel
   ];
 
   propagatedBuildInputs = [
-    gettext gobjectIntrospection gtk3 libnotify docopt gbulb
+    gettext gobjectIntrospection gtk3 libnotify docopt
     pygobject3 pyyaml udisks2 libappindicator-gtk3
   ];
 
diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix
deleted file mode 100644
index 3fb1e9b0349a1..0000000000000
--- a/pkgs/development/python-modules/gbulb/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pygobject3
-, gobjectIntrospection
-, gtk3
-}:
-
-buildPythonPackage rec {
-  version = "0.5.3";
-  pname = "gbulb";
-  name = "${pname}-${version}";
-
-  propagatedBuildInputs = [pygobject3 gobjectIntrospection gtk3];
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "19byqicjgb68s2lgadmwsj4c5nw7lgvz88xl90d8rvnl5vd2zs80";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = http://flask.pocoo.org/;
-    license = licenses.bsd3;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 50623fcdcca76..5aea6571d2bed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -259,8 +259,6 @@ in {
 
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
 
-  gbulb = callPackage ../development/python-modules/gbulb { };
-
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };
 
   goocalendar = callPackage ../development/python-modules/goocalendar { };