-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #14.
- Loading branch information
Showing
7 changed files
with
268 additions
and
59 deletions.
There are no files selected for viewing
14 changes: 14 additions & 0 deletions
14
pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/printing/printing.gyp b/printing/printing.gyp | ||
| index 19fa1b2..f11d76e 100644 | ||
| --- a/printing/printing.gyp | ||
| +++ b/printing/printing.gyp | ||
| @@ -26,6 +26,9 @@ | ||
| 'include_dirs': [ | ||
| '..', | ||
| ], | ||
| + 'cflags': [ | ||
| + '-Wno-deprecated-declarations', | ||
| + ], | ||
| 'sources': [ | ||
| 'backend/print_backend.cc', | ||
| 'backend/print_backend.h', |
233 changes: 179 additions & 54 deletions
233
pkgs/applications/networking/browsers/chromium/default.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
pkgs/applications/networking/browsers/chromium/enable_seccomp.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| diff --git a/content/common/seccomp_sandbox.h b/content/common/seccomp_sandbox.h | ||
| index a07d6f3..a622a35 100644 | ||
| --- a/content/common/seccomp_sandbox.h | ||
| +++ b/content/common/seccomp_sandbox.h | ||
| @@ -29,15 +29,9 @@ static bool SeccompSandboxEnabled() { | ||
| // TODO(evan): turn on for release too once we've flushed out all the bugs, | ||
| // allowing us to delete this file entirely and just rely on the "disabled" | ||
| // switch. | ||
| -#ifdef NDEBUG | ||
| - // Off by default; allow turning on with a switch. | ||
| - return CommandLine::ForCurrentProcess()->HasSwitch( | ||
| - switches::kEnableSeccompSandbox); | ||
| -#else | ||
| // On by default; allow turning off with a switch. | ||
| return !CommandLine::ForCurrentProcess()->HasSwitch( | ||
| switches::kDisableSeccompSandbox); | ||
| -#endif // NDEBUG | ||
| } | ||
| #endif // SECCOMP_SANDBOX | ||
|
|
12 changes: 12 additions & 0 deletions
12
pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| 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': [ | ||
| '<!@(pkg-config --cflags libpulse)', | ||
| + '-Wno-array-bounds', | ||
| ], | ||
| 'link_settings': { | ||
| 'libraries': [ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| version = "21.0.1179.1"; | ||
| url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1179.1.tar.bz2"; | ||
| sha256 = "1ynm1dv8nwjg6a0absid1g3r62y0mpb74pmal8g9nmqb92rlkdnc"; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| #!/bin/sh | ||
|
|
||
| bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/"; | ||
|
|
||
| get_newest_version() | ||
| { | ||
| curl -s "$bucket_url" | sed -ne ' H;/<[Kk][Ee][Yy]>chromium-[^<]*</h;${ | ||
| g;s/^.*<Key>chromium-\([^<.]\+\(\.[^<.]\+\)\+\)\.tar\.bz2<.*$/\1/p | ||
| }'; | ||
| } | ||
|
|
||
| cd "$(dirname "$0")"; | ||
|
|
||
| version="$(get_newest_version)"; | ||
|
|
||
| if [ -e source.nix ]; then | ||
| oldver="$(sed -n 's/^ *version *= *"\([^"]\+\)".*$/\1/p' source.nix)"; | ||
| if [ "x$oldver" = "x$version" ]; then | ||
| echo "Already the newest version: $version" >&2; | ||
| exit 1; | ||
| fi; | ||
| fi; | ||
|
|
||
| url="${bucket_url%/}/chromium-$version.tar.bz2"; | ||
|
|
||
| sha256="$(nix-prefetch-url "$url")"; | ||
|
|
||
| cat > source.nix <<EOF | ||
| { | ||
| version = "$version"; | ||
| url = "$url"; | ||
| sha256 = "$sha256"; | ||
| } | ||
| EOF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters