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

pkgs/development/tools/analysis/egypt/default.nix

@@ -9,6 +9,8 @@ buildPerlPackage rec {
     url = "http://www.gson.org/egypt/download/${name}.tar.gz";
   };
 
+  outputs = [ "out" ];
+
   enableParallelBuilding = true;
 
   doCheck = true;

pkgs/development/tools/analysis/valkyrie/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4 }:
+{ stdenv, fetchurl, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
   name = "valkyrie-2.0.0";
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qt4 ];
-
-  configurePhase = "qmake PREFIX=$out";
+  nativeBuildInputs = [ qmake4Hook ];
 
   meta = {
     homepage = http://www.valgrind.org/;