diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2013-03-26 22:07:32 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2013-03-27 00:26:56 +0100 |
| commit | 432e0f869cf7cb6eea239b96555bfd1612e93fef (patch) | |
| tree | 0f4f15b7a00da1447099563b389a3b60685c6665 /pkgs | |
| parent | adfc5939a7d59d78d3509c152223bd79537d80fd (diff) | |
| download | nixlib-432e0f869cf7cb6eea239b96555bfd1612e93fef.tar nixlib-432e0f869cf7cb6eea239b96555bfd1612e93fef.tar.gz nixlib-432e0f869cf7cb6eea239b96555bfd1612e93fef.tar.bz2 nixlib-432e0f869cf7cb6eea239b96555bfd1612e93fef.tar.lz nixlib-432e0f869cf7cb6eea239b96555bfd1612e93fef.tar.xz nixlib-432e0f869cf7cb6eea239b96555bfd1612e93fef.tar.zst nixlib-432e0f869cf7cb6eea239b96555bfd1612e93fef.zip | |
chromium: Remove patch for CLONE_DETACHED.
This patch was introduced before (7e5109a) the stdenv-updates merge and is no longer needed, as the current C library doesn't use this flag anymore. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/clone_detached.patch | 19 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/clone_detached.patch b/pkgs/applications/networking/browsers/chromium/clone_detached.patch deleted file mode 100644 index 682de656459e..000000000000 --- a/pkgs/applications/networking/browsers/chromium/clone_detached.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 222f1e980ab84ffd3a21001feaf06dd537570a1a Mon Sep 17 00:00:00 2001 -From: Ian Farmer <ian@ianfarmer.net> -Date: Sat, 16 Feb 2013 09:38:10 -0800 -Subject: [PATCH] Update Chromium dev channel version to 26.0.1410.5. - -This version requires a patch for compatibility with versions -of glibc that support older kernel versions. - ---- a/content/common/sandbox_seccomp_bpf_linux.cc 2013-02-15 23:26:06.000000000 -0800 -+++ b/content/common/sandbox_seccomp_bpf_linux.cc 2013-02-15 23:26:24.000000000 -0800 -@@ -1313,7 +1313,7 @@ - return Sandbox::Cond(0, ErrorCode::TP_32BIT, ErrorCode::OP_EQUAL, - CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | - CLONE_THREAD | CLONE_SYSVSEM | CLONE_SETTLS | -- CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID, -+ CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED, - ErrorCode(ErrorCode::ERR_ALLOWED), - Sandbox::Trap(ReportCloneFailure, NULL)); - } else { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 019ba1792f3b..094ddb54c38a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -126,7 +126,6 @@ in stdenv.mkDerivation rec { patches = optional cupsSupport ./cups_allow_deprecated.patch ++ optional pulseSupport ./pulseaudio_array_bounds.patch - ++ optional post25 ./clone_detached.patch ++ [ ./glibc-2.16-use-siginfo_t.patch ]; postPatch = '' |