summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/chromium/common.nix
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2020-12-09 19:29:31 +0100
committerMichael Weiss <dev.primeos@gmail.com>2020-12-10 17:41:22 +0100
commit240a8f746e0e3e698fc87cb9934ffaef7e09e5bf (patch)
treee8f6b4f080a9abe050f0ec3987da12d822ced27a /pkgs/applications/networking/browsers/chromium/common.nix
parent2b6b43447784cff29d639ae5f9a86bf768cffe52 (diff)
downloadnixpkgs-240a8f746e0e3e698fc87cb9934ffaef7e09e5bf.tar
nixpkgs-240a8f746e0e3e698fc87cb9934ffaef7e09e5bf.tar.gz
nixpkgs-240a8f746e0e3e698fc87cb9934ffaef7e09e5bf.tar.bz2
nixpkgs-240a8f746e0e3e698fc87cb9934ffaef7e09e5bf.tar.lz
nixpkgs-240a8f746e0e3e698fc87cb9934ffaef7e09e5bf.tar.xz
nixpkgs-240a8f746e0e3e698fc87cb9934ffaef7e09e5bf.tar.zst
nixpkgs-240a8f746e0e3e698fc87cb9934ffaef7e09e5bf.zip
ungoogled-chromium: Move ungoogled-src.nix into upstream-info.json
This also adds a dedicated channel for ungoogled-chromium that enables
us to update ungoogled-chromium independently of chromium.
TODO: Automate ungoogled-chromium updates via update.py (currently it
needs to be updated manually).

Note: Unfortunately this changes the ungoogled-chromium derivation
because common.nix passes the channel as an argument to
stdenv.mkDerivation (this makes it more difficult to verify this commit
but the result should remain the same).
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index c396e5996de..d754c2769c9 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -110,11 +110,10 @@ let
             result
        else result;
 
-  ungoogler =
-    let versionEntry = (import ./ungoogled-src.nix)."${upstream-info.version}";
-    in ungoogled-chromium {
-      inherit (versionEntry) rev sha256;
-    };
+  ungoogler = ungoogled-chromium {
+    inherit (upstream-info.deps.ungoogled-patches) rev sha256;
+  };
+
   base = rec {
     name = "${packageName}-unwrapped-${version}";
     inherit (upstream-info) version;