From 254a16c42e20a6b7375a7cf856a8ee69b7ba8d63 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Tue, 30 Oct 2018 17:10:14 +0200 Subject: [PATCH] chroimum: Improve jumbo reproducibility A little patch to jumbo script, which should improve reproducibility by sorting source files before merge. --- .../networking/browsers/chromium/common.nix | 1 + .../browsers/chromium/patches/jumbo-sorted.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7ec94f3ab12e..bc0d9a5c2b08 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -132,6 +132,7 @@ let patches = optional enableWideVine ./patches/widevine.patch ++ [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch + ./patches/jumbo-sorted.patch # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. diff --git a/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch b/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch new file mode 100644 index 000000000000..cdf0f695f761 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/jumbo-sorted.patch @@ -0,0 +1,11 @@ +--- chromium-70.0.3538.67/build/config/merge_for_jumbo.py.old 2018-10-25 19:15:54.578222230 +0300 ++++ chromium-70.0.3538.67/build/config/merge_for_jumbo.py 2018-10-25 19:20:44.397613032 +0300 +@@ -132,6 +132,8 @@ + assert not inputs + continue + ++ inputs.sort() ++ outputs.sort() + write_jumbo_files(inputs, outputs, written_input_set, written_output_set) + + assert set(args.outputs) == written_output_set, "Did not fill all outputs"