networkmanager_dmenu: init at unstable-2017-04-13

1 files changed, 16 insertions, 11 deletions

diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/networkmanager_dmenu/default.nix
index 7462a3d809c6..f9b84be6015f 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;
   };
 }