From cf9275bba4307d6beb7ea6facd1f3d5f2e18ab4e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 11:55:08 +0100 Subject: [PATCH] chromium: Fix build http://hydra.nixos.org/build/3914341 --- .../networking/browsers/chromium/default.nix | 3 ++- .../chromium/glibc-2.16-use-siginfo_t.patch | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e32b31dc856..36e54b4686a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -117,7 +117,8 @@ in stdenv.mkDerivation rec { patches = optional cupsSupport ./cups_allow_deprecated.patch ++ optional pulseSupport ./pulseaudio_array_bounds.patch - ++ maybeFixPulseAudioBuild; + ++ maybeFixPulseAudioBuild + ++ [ ./glibc-2.16-use-siginfo_t.patch ]; postPatch = optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl diff --git a/pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch b/pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch new file mode 100644 index 00000000000..d06555dda54 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch @@ -0,0 +1,27 @@ +--- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.orig 2012-12-22 16:01:44.000000000 +0200 ++++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-12-23 21:53:26.746069153 +0200 +@@ -250,7 +250,7 @@ + struct kernel_old_sigaction { + union { + void (*sa_handler_)(int); +- void (*sa_sigaction_)(int, struct siginfo *, void *); ++ void (*sa_sigaction_)(int, siginfo_t *, void *); + }; + unsigned long sa_mask; + unsigned long sa_flags; +@@ -287,13 +287,13 @@ + unsigned long sa_flags; + union { + void (*sa_handler_)(int); +- void (*sa_sigaction_)(int, struct siginfo *, void *); ++ void (*sa_sigaction_)(int, siginfo_t *, void *); + }; + struct kernel_sigset_t sa_mask; + #else + union { + void (*sa_handler_)(int); +- void (*sa_sigaction_)(int, struct siginfo *, void *); ++ void (*sa_sigaction_)(int, siginfo_t *, void *); + }; + unsigned long sa_flags; + void (*sa_restorer)(void);