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: 29f5fe1faa1c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 86f83d505689
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 19, 2021

  1. gperftools: drop an option that seems no longer supported 

    > warning: unknown warning option '-Wno-aligned-allocation-unavailable';
>   did you mean '-Wno-debug-compression-unavailable'? [-Wunknown-warning-option]
    @vcunat
    vcunat committed Jan 19, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    502357e View commit details

  2. gperftools: use lib instead of stdenv.lib 

    See c06b2b3.
    @vcunat
    vcunat committed Jan 19, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fb7a68d View commit details

  3. Merge #109996: gperftools: fix build on darwin

    @vcunat
    vcunat committed Jan 19, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    86f83d5 View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 pkgs/development/libraries/gperftools/default.nix
14 changes: 7 additions & 7 deletions pkgs/development/libraries/gperftools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }:
{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, libunwind }:

stdenv.mkDerivation rec {
name = "gperftools-2.8";
@@ -20,29 +20,29 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];

# tcmalloc uses libunwind in a way that works correctly only on non-ARM linux
buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;

# Disable general dynamic TLS on AArch to support dlopen()'ing the library:
# https://bugzilla.redhat.com/show_bug.cgi?id=1483558
configureFlags = stdenv.lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
"--disable-general-dynamic-tls";

prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile.am --replace stdc++ c++
substituteInPlace Makefile.in --replace stdc++ c++
substituteInPlace libtool --replace stdc++ c++
'';

NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
"-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
"-D_XOPEN_SOURCE";

# some packages want to link to the static tcmalloc_minimal
# to drop the runtime dependency on gperftools
dontDisableStatic = true;

enableParallelBuilding = true;

meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/gperftools/gperftools";
description = "Fast, multi-threaded malloc() and nifty performance analysis tools";
platforms = with platforms; linux ++ darwin;