bloaty: 2016-12-28 -> 2017-10-05

* use fetchFromGitHub now that it supports submodules
* change version style to dashes per guidelines
  (https://nixos.org/nixpkgs/manual/#sec-package-naming)
* cmake
* prefer substituteInPlace
* run tests

1 files changed, 17 insertions, 8 deletions

diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index 8970f7a86d19..e61b7f78302b 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -1,22 +1,31 @@
-{ stdenv, binutils, fetchgit }:
+{ stdenv, binutils, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "2016.12.28";
+  version = "2017-10-05";
   name = "bloaty-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/google/bloaty.git";
-    rev = "2234386bcee7297dfa1b6d8a5d20f95ea4ed9bb0";
-    sha256 = "0cfsjgbp9r16d6qi8v4k609bbhjff4vhdiapfkhr34z1cik1md4l";
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "bloaty";
+    rev = "e47b21b01ceecf001e1965e9da249d48d86a1749";
+    sha256 = "1il3z49hi0b07agjwr5fg1wzysfxsamfv1snvlp33vrlyl1m7cbm";
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [ cmake ];
+
   enableParallelBuilding = true;
 
-  configurePhase = ''
-    sed -i 's,c++filt,${binutils}/bin/c++filt,' src/bloaty.cc
+  preConfigure = ''
+    substituteInPlace src/bloaty.cc \
+      --replace "c++filt" \
+                "${stdenv.lib.getBin binutils}/bin/c++filt"
   '';
 
+  doCheck = true;
+
+  checkPhase = "ctest";
+
   installPhase = ''
     install -Dm755 {.,$out/bin}/bloaty
   '';