diff options
Diffstat (limited to 'pkgs/applications/networking/browsers')
3 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index ac924730989..4987988eb3e 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -26,6 +26,7 @@ , libXext , libXfixes , libXi +, libxkbcommon , libXrandr , libXrender , libXScrnSaver @@ -61,6 +62,7 @@ rpath = lib.makeLibraryPath [ libdrm libpulseaudio libX11 + libxkbcommon libXScrnSaver libXcomposite libXcursor @@ -68,6 +70,7 @@ rpath = lib.makeLibraryPath [ libXext libXfixes libXi + libxkbcommon libXrandr libXrender libXtst @@ -86,11 +89,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.16.76"; + version = "1.17.73"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1nbgiwflmr3ik428yarmnpx10dmqai2m4k910miqd92mwmfb0pib"; + sha256 = "18bd6kgzfza5r0y2ggfy82pdpnfr2hzgjcfy9vxqq658z7q3jpqy"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 92434806a12..988f47f3bfb 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -386,4 +386,6 @@ buildStdenv.mkDerivation ({ # on aarch64 this is also required dontUpdateAutotoolsGnuConfigScripts = true; + + requiredSystemFeatures = [ "big-parallel" ]; }) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 543d5925547..73a095b0827 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core +, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , kerberos, libdrm, mesa , libxkbcommon, wayland # ozone/wayland @@ -38,7 +38,7 @@ , chromium , gsettings-desktop-schemas -, gnome2, gnome3 +, gnome3 }: with stdenv.lib; @@ -49,8 +49,6 @@ let }; version = chromium.upstream-info.version; - gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; - gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; deps = [ glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr @@ -65,7 +63,7 @@ let kerberos libdrm mesa coreutils libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio - ++ [ gtk ]; + ++ [ gtk3 ]; suffix = if channel != "stable" then "-" + channel else ""; @@ -79,10 +77,10 @@ in stdenv.mkDerivation { nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gtk + gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + gnome3.adwaita-icon-theme ]; unpackPhase = '' |