about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-05-22 16:04:56 -0500
committerWill Dietz <w@wdtz.org>2018-05-22 16:23:20 -0500
commitb7fe62d532307fbe9282b76fa5cc5cbd8cb0eafe (patch)
treed39a15f2b360ca9df7e02627d84420f503ee9ab5 /pkgs/development
parent71da438f21f1e07dd0523bfeb7d81d6aa3a4f14e (diff)
downloadnixlib-b7fe62d532307fbe9282b76fa5cc5cbd8cb0eafe.tar
nixlib-b7fe62d532307fbe9282b76fa5cc5cbd8cb0eafe.tar.gz
nixlib-b7fe62d532307fbe9282b76fa5cc5cbd8cb0eafe.tar.bz2
nixlib-b7fe62d532307fbe9282b76fa5cc5cbd8cb0eafe.tar.lz
nixlib-b7fe62d532307fbe9282b76fa5cc5cbd8cb0eafe.tar.xz
nixlib-b7fe62d532307fbe9282b76fa5cc5cbd8cb0eafe.tar.zst
nixlib-b7fe62d532307fbe9282b76fa5cc5cbd8cb0eafe.zip
bloaty: 2017-10-05 -> 2018-05-22
* add zlib dep (cmake tries to find it, provide it JIC)
* no need to populate with path to c++filt, handled internally now
* continue to copy ourselves, new install target isn't ready yet
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/tools/bloaty/default.nix16
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index 0dbe1aa78c50..9b18bcb25616 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -1,26 +1,22 @@
-{ stdenv, binutils, cmake, fetchFromGitHub }:
+{ stdenv, binutils, cmake, zlib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "2017-10-05";
+  version = "2018-05-22";
   name = "bloaty-${version}";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "bloaty";
-    rev = "e47b21b01ceecf001e1965e9da249d48d86a1749";
-    sha256 = "1il3z49hi0b07agjwr5fg1wzysfxsamfv1snvlp33vrlyl1m7cbm";
+    rev = "054788b091ccfd43b05b9817062139145096d440";
+    sha256 = "0pmv66137ipzsjjdz004n61pz3aipjhh3b0w0y1406clqpwkvpjm";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
+  buildInputs = [ zlib ];
 
-  preConfigure = ''
-    substituteInPlace src/bloaty.cc \
-      --replace "c++filt" \
-                "${binutils.bintools}/bin/c++filt"
-  '';
+  enableParallelBuilding = true;
 
   doCheck = true;