diff options
| author | Cray Elliott <MP2E@archlinux.us> | 2014-08-29 01:45:31 -0700 |
|---|---|---|
| committer | Aristid Breitkreuz <aristidb@gmail.com> | 2014-08-29 20:48:02 +0200 |
| commit | 8eb3de7c86355c2061608e9a0f64150fbdbcc7ec (patch) | |
| tree | 6cf753620d1b29056fffdcb8a9d131f41ad1fc63 /pkgs/applications/networking/browsers/chromium/source | |
| parent | 0ffa7dc0f28f7aaf517f68c5c6812272cbb822ed (diff) | |
| download | nixpkgs-8eb3de7c86355c2061608e9a0f64150fbdbcc7ec.tar nixpkgs-8eb3de7c86355c2061608e9a0f64150fbdbcc7ec.tar.gz nixpkgs-8eb3de7c86355c2061608e9a0f64150fbdbcc7ec.tar.bz2 nixpkgs-8eb3de7c86355c2061608e9a0f64150fbdbcc7ec.tar.lz nixpkgs-8eb3de7c86355c2061608e9a0f64150fbdbcc7ec.tar.xz nixpkgs-8eb3de7c86355c2061608e9a0f64150fbdbcc7ec.tar.zst nixpkgs-8eb3de7c86355c2061608e9a0f64150fbdbcc7ec.zip | |
Chromium patch, fixes missing header
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/source')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/source/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index d7ccc412fa4..91c6ada5138 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = singleton ./sandbox_userns_36.patch; + patches = [ ./sandbox_userns_36.patch ./missing_alg_import.patch ]; postPatch = '' sed -i -r \ diff --git a/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch b/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch new file mode 100644 index 00000000000..243e3fe7049 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch @@ -0,0 +1,11 @@ +diff -Naur chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc +--- chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc 2014-08-29 02:05:15.149140733 -0700 ++++ chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc 2014-08-29 02:06:00.182853590 -0700 +@@ -4,6 +4,7 @@ + + #include "media/cast/logging/encoding_event_subscriber.h" + ++#include <algorithm> + #include <cstring> + #include <utility> + |