From 87a450e4669ca22ff35d2abe031a48900989b82b Mon Sep 17 00:00:00 2001
From: Jens Grunert <jens.grunert@gmail.com>
Date: Wed, 1 Mar 2017 05:55:09 +0100
Subject: [PATCH 1/2] Adding networkmanager_dmenu

---
 .../networkmanager_dmenu/default.nix          | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/networking/networkmanager_dmenu/default.nix

diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/networkmanager_dmenu/default.nix
new file mode 100644
index 00000000000..7462a3d809c
--- /dev/null
+++ b/pkgs/tools/networking/networkmanager_dmenu/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, glib, fetchFromGitHub, networkmanager, python3Packages
+, gobjectIntrospection, dmenu, makeWrapper }:
+
+let inherit (python3Packages) python pygobject3;
+in stdenv.mkDerivation rec {
+  name = "networkmanager_dmenu-${version}";
+  version = "git-20170301";
+
+  src = fetchFromGitHub {
+    owner = "firecat53";
+    repo = "networkmanager-dmenu";
+    rev = "f631f34645cd581eb14cb2f3286fa02dcc60283f";
+    sha256 = "0f3rkyhhyy3ab0bnaasazx33b952gfl3g3b3sg8fl00n90l53d11";
+  };
+
+  buildInputs = [ glib python pygobject3 makeWrapper gobjectIntrospection networkmanager ];
+
+  phases = "unpackPhase installPhase";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp networkmanager_dmenu $out/bin/
+    wrapProgram $out/bin/networkmanager_dmenu \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})"
+  '';
+
+  meta = with stdenv.lib; {
+    description  = "Small script to manage NetworkManager connections with dmenu instead of nm-applet";
+    homepage     = https://github.com/firecat53/networkmanager-dmenu;
+    license      = stdenv.lib.licenses.mit;
+    maintainers  = [ ];
+    platforms    = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 170fa60c27b..ee0f3464666 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3055,6 +3055,8 @@ with pkgs;
 
   networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { };
 
+  networkmanager_dmenu = callPackage ../tools/networking/networkmanager_dmenu  { };
+
   newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };
 
   newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { };

From 4c6d267ae88868abe79a60d5d65bdf7ba1770a0b Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin@protonmail.com>
Date: Mon, 1 May 2017 19:06:23 +0200
Subject: [PATCH 2/2] networkmanager_dmenu: init at unstable-2017-04-13

---
 lib/maintainers.nix                           |  1 +
 .../networkmanager_dmenu/default.nix          | 27 +++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 07fa9e632eb..e9074c644e3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -218,6 +218,7 @@
   jcumming = "Jack Cummings <jack@mudshark.org>";
   jdagilliland = "Jason Gilliland <jdagilliland@gmail.com>";
   jefdaj = "Jeffrey David Johnson <jefdaj@gmail.com>";
+  jensbin = "Jens Binkert <jensbin@protonmail.com>";
   jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>";
   jfb = "James Felix Black <james@yamtime.com>";
   jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/networkmanager_dmenu/default.nix
index 7462a3d809c..f9b84be6015 100644
--- a/pkgs/tools/networking/networkmanager_dmenu/default.nix
+++ b/pkgs/tools/networking/networkmanager_dmenu/default.nix
@@ -1,35 +1,40 @@
 { stdenv, glib, fetchFromGitHub, networkmanager, python3Packages
-, gobjectIntrospection, dmenu, makeWrapper }:
+, gobjectIntrospection, dmenu }:
 
 let inherit (python3Packages) python pygobject3;
 in stdenv.mkDerivation rec {
-  name = "networkmanager_dmenu-${version}";
-  version = "git-20170301";
+  name = "networkmanager_dmenu-unstable-${version}";
+  version = "2017-04-13";
 
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "networkmanager-dmenu";
-    rev = "f631f34645cd581eb14cb2f3286fa02dcc60283f";
-    sha256 = "0f3rkyhhyy3ab0bnaasazx33b952gfl3g3b3sg8fl00n90l53d11";
+    rev = "fbc0704702b32c2efb30ba6b5c0ad6f054a71a18";
+    sha256 = "1584zrhla1njvkrbvb1rq66q06gs510f0l1ls3z7x7jmn322y6yr";
   };
 
-  buildInputs = [ glib python pygobject3 makeWrapper gobjectIntrospection networkmanager ];
+  buildInputs = [ glib python pygobject3 gobjectIntrospection networkmanager python3Packages.wrapPython ];
 
-  phases = "unpackPhase installPhase";
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p $out/bin
     cp networkmanager_dmenu $out/bin/
-    wrapProgram $out/bin/networkmanager_dmenu \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})"
   '';
 
+  postFixup = ''
+    makeWrapperArgs="\
+      --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
+      --prefix PYTHONPATH : \"$(toPythonPath $out):$(toPythonPath ${pygobject3})\""
+    wrapPythonPrograms
+  '';
+
+
   meta = with stdenv.lib; {
     description  = "Small script to manage NetworkManager connections with dmenu instead of nm-applet";
     homepage     = https://github.com/firecat53/networkmanager-dmenu;
     license      = stdenv.lib.licenses.mit;
-    maintainers  = [ ];
+    maintainers  = [ stdenv.lib.maintainers.jensbin ];
     platforms    = stdenv.lib.platforms.all;
   };
 }