From d6b11ed722ae4ba60e5b67fba03b2be7bef3093d Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 20 Mar 2016 16:44:34 +0100 Subject: [PATCH] chromium/source: Move patches into its own subdir We're going to reference the patches in the Chromium main build rather than applying it to the sources. So as a first step, this should keep the patches away from the "source" subdirectory so we can make it flat. Signed-off-by: aszlig --- .../chromium/{source => patches}/build_fixes_46.patch | 0 .../{source => patches}/nix_plugin_paths_46.patch | 0 .../{source => patches}/nix_plugin_paths_50.patch | 0 .../browsers/chromium/{source => patches}/widevine.patch | 0 .../networking/browsers/chromium/source/default.nix | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/applications/networking/browsers/chromium/{source => patches}/build_fixes_46.patch (100%) rename pkgs/applications/networking/browsers/chromium/{source => patches}/nix_plugin_paths_46.patch (100%) rename pkgs/applications/networking/browsers/chromium/{source => patches}/nix_plugin_paths_50.patch (100%) rename pkgs/applications/networking/browsers/chromium/{source => patches}/widevine.patch (100%) diff --git a/pkgs/applications/networking/browsers/chromium/source/build_fixes_46.patch b/pkgs/applications/networking/browsers/chromium/patches/build_fixes_46.patch similarity index 100% rename from pkgs/applications/networking/browsers/chromium/source/build_fixes_46.patch rename to pkgs/applications/networking/browsers/chromium/patches/build_fixes_46.patch diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_46.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_46.patch similarity index 100% rename from pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_46.patch rename to pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_46.patch diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch similarity index 100% rename from pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch rename to pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch diff --git a/pkgs/applications/networking/browsers/chromium/source/widevine.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch similarity index 100% rename from pkgs/applications/networking/browsers/chromium/source/widevine.patch rename to pkgs/applications/networking/browsers/chromium/patches/widevine.patch diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index a566c4bb1c87..bc646f6b252c 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation { ''; patches = [ - ./build_fixes_46.patch - ./widevine.patch + ../patches/build_fixes_46.patch + ../patches/widevine.patch (if versionOlder version "50.0.0.0" - then ./nix_plugin_paths_46.patch - else ./nix_plugin_paths_50.patch) + then ../patches/nix_plugin_paths_46.patch + else ../patches/nix_plugin_paths_50.patch) ]; patchPhase = let