diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 97dd719e7fc..b0dc8721747 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -12,12 +12,9 @@ , utillinux, alsaLib , gcc, bison, gperf , glib, gtk, dbus_glib -, libXScrnSaver, libXcursor, mesa +, libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage -# dependencies for >= v27 -, libXtst - # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -81,11 +78,6 @@ let libusb1 libexif ]; - pre27 = versionOlder sourceInfo.version "27.0.0.0"; - pre28 = versionOlder sourceInfo.version "28.0.0.0"; - post26 = !pre27; - post27 = !pre28; - # build paths and release info packageName = "chromium"; buildType = "Release"; @@ -112,23 +104,20 @@ in stdenv.mkDerivation rec { gcc bison gperf krb5 glib gtk dbus_glib - libXScrnSaver libXcursor mesa + libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring ++ optionals gnomeSupport [ gconf libgcrypt ] ++ optional enableSELinux libselinux ++ optional cupsSupport libgcrypt - ++ optional pulseSupport pulseaudio - ++ optional post26 libXtst; + ++ optional pulseSupport pulseaudio; opensslPatches = optional useOpenSSL openssl.patches; prePatch = "patchShebangs ."; patches = [ ./sandbox_userns.patch ] - ++ optional cupsSupport ./cups_allow_deprecated.patch - ++ optional (pulseSupport && pre27) ./pulseaudio_array_bounds.patch - ++ optional pre27 ./glibc-2.16-use-siginfo_t.patch; + ++ optional cupsSupport ./cups_allow_deprecated.patch; postPatch = '' sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi @@ -136,7 +125,7 @@ in stdenv.mkDerivation rec { cat $opensslPatches | patch -p1 -d third_party/openssl/openssl '' + '' sed -i -e 's|/usr/bin/gcc|gcc|' \ - third_party/WebKit/Source/${if post27 + third_party/WebKit/Source/${if !versionOlder sourceInfo.version "28.0.0.0" then "core/core.gypi" else "WebCore/WebCore.gyp/WebCore.gyp"} ''; 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 deleted file mode 100644 index d06555dda54..00000000000 --- a/pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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); diff --git a/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch b/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch deleted file mode 100644 index ca78b6959c0..00000000000 --- a/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/media/media.gyp b/media/media.gyp -index 2a8c6c6..66ca767 100644 ---- a/media/media.gyp -+++ b/media/media.gyp -@@ -399,6 +399,7 @@ - ['use_pulseaudio == 1', { - 'cflags': [ - '