Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 60ffad555d0d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8343b0a76e22
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 22, 2018

  1. 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
    @dtzWill
    dtzWill committed May 22, 2018
    Copy the full SHA
    b7fe62d View commit details

  2. Merge pull request #40940 from dtzWill/update/bloaty-2018-05-22 

    bloaty: 2017-10-05 -> 2018-05-22
    @lukateras
    lukateras authored May 22, 2018
    Copy the full SHA
    8343b0a View commit details
Showing with 6 additions and 10 deletions.
  1. +6 −10 pkgs/development/tools/bloaty/default.nix
16 changes: 6 additions & 10 deletions pkgs/development/tools/bloaty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;