7 files changed, 39 insertions, 42 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index d7ab712dae64..7c6f3cfdffb1 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qtbase, icu, sqlite
+, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite
 , makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp
 , xdg_utils
 }:
@@ -26,7 +26,14 @@ stdenv.mkDerivation rec {
       setup/build_environment.py
   '';
 
-  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  dontUseQmakeConfigure = true;
+  # hack around a build problem
+  preBuild = ''
+    mkdir -p ../tmp.*/lib
+    ln -s '${qtbase.out}/lib/libQt5PlatformSupport.a' ../tmp.*/lib/
+  '';
+
+  nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ];
 
   buildInputs =
     [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index ca807f80e1bf..d5442a2ded8b 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -5,7 +5,7 @@ let
     version = "0.1.7";
     name = "jsonrpclib-${version}";
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jsonrpclib/${name}.tar.gz";
+      url = "mirror://pypi/j/jsonrpclib/${name}.tar.gz";
       sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z";
     };
     propagatedBuildInputs = [ pythonPackages.cjson ];
diff --git a/pkgs/applications/misc/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix
index d5c98a2affa7..486d3fb7ddf7 100644
--- a/pkgs/applications/misc/k3b/wrapper.nix
+++ b/pkgs/applications/misc/k3b/wrapper.nix
@@ -1,22 +1,14 @@
-{ lib, buildEnv, k3b-original, cdrtools, makeWrapper }:
+{ lib, symlinkJoin, k3b-original, cdrtools, makeWrapper }:
 
 let
   binPath = lib.makeBinPath [ cdrtools ];
-in buildEnv {
+in symlinkJoin {
   name = "k3b-${k3b-original.version}";
 
   paths = [ k3b-original ];
   buildInputs = [ makeWrapper ];
 
   postBuild = ''
-    # TODO: This could be avoided if buildEnv could be forced to create all directories
-    if [ -L $out/bin ]; then
-      rm $out/bin
-      mkdir $out/bin
-      for i in ${k3b-original}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
     wrapProgram $out/bin/k3b \
       --prefix PATH ':' ${binPath}
   '';
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 9f083592c409..e1786cc1b08d 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec {
   name = "khal-${version}";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/k/khal/khal-${version}.tar.gz";
+    url = "mirror://pypi/k/khal/khal-${version}.tar.gz";
     sha256 = "00llxj7cv31mjsx0j6zxmyi9s1q20yvfkn025xcy8cv1ylfwic66";
   };
 
diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix
index 1eb65a59470b..dcb36082231f 100644
--- a/pkgs/applications/misc/pitz/default.nix
+++ b/pkgs/applications/misc/pitz/default.nix
@@ -16,7 +16,7 @@ buildPythonApplication rec {
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://pypi.python.org/packages/source/p/pitz/${name}.tar.gz";
+    url = "mirror://pypi/p/pitz/${name}.tar.gz";
     sha256 = "1k7f3h4acllzqy3mjqnjd4w5jskp03s79b7dx3c85vlmd7824smr";
   };
 
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 15f249ac9061..342a03f89843 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }:
+{ stdenv, fetchzip, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }:
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6";
+    sha256 = "1x1ic9as0a60gz664sf8d1qiq64ji7q60g19x0rlm3bvcp2612c8";
   };
 
-  buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools qmakeHook ];
+  buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
+
+  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
 
   preConfigure = ''
     qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out"
@@ -18,9 +20,12 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir $out/bin
     mv $out/qtpass $out/bin
+    install -D {,$out/share/applications/}qtpass.desktop
+    install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
+    runHook postInstall
   '';
 
-  postFixup = ''
+  postInstall = ''
     wrapQtProgram $out/bin/qtpass \
       --suffix PATH : ${git}/bin \
       --suffix PATH : ${gnupg}/bin \
@@ -29,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A multi-platform GUI for pass, the standard unix password manager";
-    homepage = https://github.com/IJHack/qtpass;
+    homepage = https://qtpass.org;
     license = licenses.gpl3;
     maintainers = [ maintainers.hrdinka ];
     platforms = platforms.all;
diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
index 2f68e4ec5f11..c9b0823fb51f 100644
--- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix
+++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
@@ -1,28 +1,21 @@
-{ stdenv, buildEnv, rxvt_unicode, makeWrapper, plugins }:
+{ stdenv, symlinkJoin, rxvt_unicode, makeWrapper, plugins }:
 
 let
   rxvt = rxvt_unicode.override {
     perlSupport = true;
   };
 
-  drv = buildEnv {
-    name = "${rxvt.name}-with-plugins";
+in symlinkJoin {
+  name = "${rxvt.name}-with-plugins";
 
-    paths = [ rxvt ] ++ plugins;
+  paths = [ rxvt ] ++ plugins;
 
-    postBuild = ''
-      # TODO: This could be avoided if buildEnv could be forced to create all directories
-      if [ -L $out/bin ]; then
-        rm $out/bin
-        mkdir $out/bin
-        for i in ${rxvt}/bin/*; do
-          ln -s $i $out/bin
-        done
-      fi
-      wrapProgram $out/bin/urxvt \
-        --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
-      wrapProgram $out/bin/urxvtd \
-        --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
-    '';
-  };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+  buildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    wrapProgram $out/bin/urxvt \
+      --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
+    wrapProgram $out/bin/urxvtd \
+      --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
+  '';
+}