diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-03-20 16:44:34 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-03-20 16:44:34 +0100 |
commit | d6b11ed722ae4ba60e5b67fba03b2be7bef3093d (patch) | |
tree | bcd0426bccfc7b5cb2904eb63e800d62b2dca9c5 | |
parent | 3273605aefbde813216f4048cb359e776161097d (diff) | |
download | nixpkgs-d6b11ed722ae4ba60e5b67fba03b2be7bef3093d.tar nixpkgs-d6b11ed722ae4ba60e5b67fba03b2be7bef3093d.tar.gz nixpkgs-d6b11ed722ae4ba60e5b67fba03b2be7bef3093d.tar.bz2 nixpkgs-d6b11ed722ae4ba60e5b67fba03b2be7bef3093d.tar.lz nixpkgs-d6b11ed722ae4ba60e5b67fba03b2be7bef3093d.tar.xz nixpkgs-d6b11ed722ae4ba60e5b67fba03b2be7bef3093d.tar.zst nixpkgs-d6b11ed722ae4ba60e5b67fba03b2be7bef3093d.zip |
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 <aszlig@redmoonstudios.org>
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/patches/build_fixes_46.patch (renamed from pkgs/applications/networking/browsers/chromium/source/build_fixes_46.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_46.patch (renamed from pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_46.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_50.patch (renamed from pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/patches/widevine.patch (renamed from pkgs/applications/networking/browsers/chromium/source/widevine.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/source/default.nix | 8 |
5 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/source/build_fixes_46.patch b/pkgs/applications/networking/browsers/chromium/patches/build_fixes_46.patch index c0aeb5d3a56..c0aeb5d3a56 100644 --- a/pkgs/applications/networking/browsers/chromium/source/build_fixes_46.patch +++ b/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 index 7482be7062d..7482be7062d 100644 --- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_46.patch +++ b/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 index 062098a8522..062098a8522 100644 --- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch +++ b/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 index 45048cada87..45048cada87 100644 --- a/pkgs/applications/networking/browsers/chromium/source/widevine.patch +++ b/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 a566c4bb1c8..bc646f6b252 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 |