Merge from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=24820

1 files changed, 23 insertions, 0 deletions

diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix
new file mode 100644
index 0000000000000..3a0879d6edfd5
--- /dev/null
+++ b/pkgs/development/tools/analysis/valkyrie/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "valkyrie-2.0.0";
+
+  src = fetchurl {
+    url = "http://valgrind.org/downloads/${name}.tar.bz2";
+    sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7";
+  };
+
+  buildInputs = [ qt4 ];
+
+  configurePhase = "qmake PREFIX=$out";
+
+  meta = {
+    homepage = http://www.valgrind.org/;
+    description = "Qt4-based GUI for the Valgrind 3.6.x series";
+
+    license = "GPLv2";
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}