nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-14 11:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

gperftools: upgrade to 2.1

Browse Source
This commit is contained in:
Mathijs Kwik 2013-11-08 23:45:47 +01:00
parent 10f250f65c
commit 1b88488988
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/gperftools/default.nix
View File

@ -1,17 +1,19 @@
{ stdenv, fetchurl, libunwind }:
stdenv.mkDerivation rec {
name = "gperftools-2.0";
name = "gperftools-2.1";
src = fetchurl {
url = "https://gperftools.googlecode.com/files/${name}.tar.gz";
sha1 = "da7181a7ba9b5ee7302daf6c16e886c179fe8d1b";
sha256 = "0ks9gsnhxrs2vccc6ha9m8xmj83lmw09xcws4zc0k57q4jcy5bgk";
};
patches = [ ./glibc-2.16.patch ];
buildInputs = [ libunwind ];
# some packages want to link to the static tcmalloc_minimal
# to drop the runtime dependency on gperftools
dontDisableStatic = true;
enableParallelBuilding = true;
meta = {

13
pkgs/development/libraries/gperftools/glibc-2.16.patch
View File

@ -1,13 +0,0 @@
Index: gperftools-2.0/src/base/linuxthreads.cc
===================================================================
--- gperftools-2.0.orig/src/base/linuxthreads.cc
+++ gperftools-2.0/src/base/linuxthreads.cc
@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
/* Signal handler to help us recover from dying while we are attached to
* other threads.
*/
-static void SignalHandler(int signum, siginfo_t *si, void *data) {
+static void SignalHandler(int signum, struct siginfo *si, void *data) {
if (sig_pids != NULL) {
if (signum == SIGABRT) {
while (sig_num_threads-- > 0) {