From 0eb389be6e718b4d668d433a3fe4dea1fa4099de Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 10 Dec 2023 22:24:39 +0100 Subject: [PATCH] chromium: move stray patches into `./patches` directory --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++-- .../chromium/{ => patches}/chromium-120-llvm-16.patch | 0 .../browsers/chromium/{ => patches}/cross-compile.patch | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/applications/networking/browsers/chromium/{ => patches}/chromium-120-llvm-16.patch (100%) rename pkgs/applications/networking/browsers/chromium/{ => patches}/cross-compile.patch (100%) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a2ce5265959e..386957bed0c2 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -237,7 +237,7 @@ let ++ lib.optional pulseSupport libpulseaudio; patches = [ - ./cross-compile.patch + ./patches/cross-compile.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: @@ -256,7 +256,7 @@ let }) ] ++ lib.optionals (chromiumVersionAtLeast "120") [ # We need to revert this patch to build M120+ with LLVM 16: - ./chromium-120-llvm-16.patch + ./patches/chromium-120-llvm-16.patch ] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [ # Fix build with at-spi2-core ≥ 2.49 # This version is still needed for electron. diff --git a/pkgs/applications/networking/browsers/chromium/chromium-120-llvm-16.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-16.patch similarity index 100% rename from pkgs/applications/networking/browsers/chromium/chromium-120-llvm-16.patch rename to pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-16.patch diff --git a/pkgs/applications/networking/browsers/chromium/cross-compile.patch b/pkgs/applications/networking/browsers/chromium/patches/cross-compile.patch similarity index 100% rename from pkgs/applications/networking/browsers/chromium/cross-compile.patch rename to pkgs/applications/networking/browsers/chromium/patches/cross-compile.patch