nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #138520 from primeos/ungoogled-chromium

Browse Source 
ungoogled-chromium: 92.0.4515.159 -> 93.0.4577.82
This commit is contained in:
Michael Weiss 2021-09-19 21:48:21 +02:00 committed by GitHub
commit 19da21137a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -85,12 +85,12 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
# https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py
gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [
"ffmpeg"
"snappy"
] ++ lib.optionals (!chromiumVersionAtLeast "95") [
gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "95") [
"zlib"
] ++ [
# TODO:
# "ffmpeg"
# "snappy"
"flac"
"libjpeg"
"libpng"

7
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,5 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_12, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils
, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
, libva, pipewire, wayland
, gcc, nspr, nss, runCommand
@ -19,7 +19,7 @@
}:
let
llvmPackages = llvmPackages_12;
llvmPackages = llvmPackages_13;
stdenv = llvmPackages.stdenv;
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
@ -54,9 +54,6 @@ let
inherit (upstream-info.deps.gn) url rev sha256;
};
});
} // lib.optionalAttrs (chromiumVersionAtLeast "93") rec {
llvmPackages = llvmPackages_13;
stdenv = llvmPackages.stdenv;
});
browser = callPackage ./browser.nix {

16
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -44,19 +44,19 @@
}
},
"ungoogled-chromium": {
"version": "92.0.4515.159",
"sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr",
"sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985",
"version": "93.0.4577.82",
"sha256": "0lr8zdq06smncdzd6knzww9hxl8ynvxadmrkyyl13fpwb1422rjx",
"sha256bin64": "0ydvcakpnl20gx7493hv6aqnyf8f28rkvzgwnm4gws92b92n9ify",
"deps": {
"gn": {
"version": "2021-05-07",
"version": "2021-07-08",
"url": "https://gn.googlesource.com/gn",
"rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
"rev": "24e2f7df92641de0351a96096fb2c490b2436bb8",
"sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"
},
"ungoogled-patches": {
"rev": "92.0.4515.159-1",
"sha256": "1mfkpkyj0sd2k07fzmxmqc24ywqqmcv3vpg1yhh96k676q0qkpd0"
"rev": "93.0.4577.82-1",
"sha256": "199f78f5gvnkpkcvh7587pk35jslkszhvv1d648b4qphzxmw7c66"
}
}
}