Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/applications/version-management/git-and-tools/qgit/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt, libXext, libX11}:
+{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "qgit-2.5";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499";
   };
 
-  buildInputs = [qt libXext libX11];
-
   hardeningDisable = [ "format" ];
 
-  configurePhase = "qmake PREFIX=$out";
+  buildInputs = [ qt4 libXext libX11 ];
+
+  nativeBuildInputs = [ qmake4Hook ];
 
   installPhase = ''
     install -s -D -m 755 bin/qgit "$out/bin/qgit"
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
     homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit";
     description = "Graphical front-end to Git";
-    inherit (qt.meta) platforms;
+    inherit (qt4.meta) platforms;
   };
 }

pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix

@@ -1,20 +1,21 @@
-{stdenv, fetchurl, qt, libXext, libX11, sourceFromHead}:
+{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11, sourceFromHead }:
 
 stdenv.mkDerivation rec {
   name = "qgit-git";
+
   meta =
   {
     license = stdenv.lib.licenses.gpl2;
     homepage = "http://digilander.libero.it/mcostalba/";
     description = "Graphical front-end to Git";
   };
+
   # REGION AUTO UPDATE:    { name="qgit"; type="git"; url="git://git.kernel.org/pub/scm/qgit/qgit4.git"; }
   src = sourceFromHead "qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz"
                (fetchurl { url = "http://mawercer.de/~nix/repos/qgit-a0252ed2a6a72b50e65d027adce8afa22e874277.tar.gz"; sha256 = "17e4727ac68b4f2e8503289d5b6a2c042547e7be133e7f8195b79e33eab61b93"; });
   # END
-  buildInputs = [qt libXext libX11];
-  buildPhase = ''
-    qmake PREFIX=$out
-    make
-  '';
+
+  buildInputs = [ qt4 libXext libX11 ];
+
+  nativeBuildInputs = [ qmake4Hook ];
 }