2 files changed, 17 insertions, 21 deletions
diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index f948ab8eb616..7c7c63ef230c 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking, gsettings_desktop_schemas
-, asciidoc, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking
+, asciidoc, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "megatools-${version}";
@@ -10,16 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv";
   };
 
-  buildInputs = [ pkgconfig glib fuse curl makeWrapper
-      gsettings_desktop_schemas asciidoc ];
-
-  postInstall = ''
-    for i in $(find $out/bin/ -type f); do
-      wrapProgram "$i" \
-            --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
-            --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook asciidoc ];
+  buildInputs = [ glib glib_networking fuse curl ];
 
   meta = with stdenv.lib; {
     description = "Command line client for Mega.co.nz";
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 0fc6d7273eaf..33db7b1cabac 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,15 +1,17 @@
-{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook, pmccabe
+{ stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe
 , xapian, glib, gmime, texinfo , emacs, guile
 , gtk3, webkitgtk24x, libsoup, icu
 , withMug ? false }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.18";
   name = "mu-${version}";
+  version = "0.9.18";
 
-  src = fetchurl {
-    url = "https://github.com/djcb/mu/archive/${version}.tar.gz";
-    sha256 = "0gfwi4dwqhsz138plryd0j935vx2i44p63jpfx85ki3l4ysmmlwd";
+  src = fetchFromGitHub {
+    owner  = "djcb";
+    repo   = "mu";
+    rev    = version;
+    sha256 = "0zy0p196bfrfzsq8f58xv04rpnr948sdvljflgzvi6js0vz4009y";
   };
 
   # as of 0.9.18 2 tests are failing but previously we had no tests
@@ -19,9 +21,10 @@ stdenv.mkDerivation rec {
 
   # pmccabe should be a checkInput instead, but configure looks for it
   buildInputs = [
-    sqlite xapian glib gmime texinfo emacs guile libsoup icu pmccabe
+    sqlite xapian glib gmime texinfo emacs guile libsoup icu
   ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ];
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  checkInputs = [ pmccabe ];
 
   doCheck = true;
 
@@ -37,8 +40,9 @@ stdenv.mkDerivation rec {
 
   # Install mug and msg2pdf
   postInstall = stdenv.lib.optionalString withMug ''
-    cp -v toys/msg2pdf/msg2pdf $out/bin/
-    cp -v toys/mug/mug $out/bin/
+    for f in msg2pdf mug ; do
+      install -m755 toys/$f/$f $out/bin/$f
+    done
   '';
 
   meta = with stdenv.lib; {
@@ -46,6 +50,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     homepage = "http://www.djcbsoftware.nl/code/mu/";
     platforms = platforms.mesaPlatforms;
-    maintainers = with maintainers; [ antono the-kenny ];
+    maintainers = with maintainers; [ antono the-kenny peterhoeg ];
   };
 }