diff options
Diffstat (limited to 'pkgs/applications/networking/browsers')
8 files changed, 35 insertions, 27 deletions
diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix index f0b9fb6cf0c6e..01458f7001828 100644 --- a/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -12,7 +12,7 @@ , freetype , gdk-pixbuf , glib -, gnome +, adwaita-icon-theme , gsettings-desktop-schemas , gtk3 , gtk4 @@ -120,7 +120,7 @@ stdenv.mkDerivation { glib gsettings-desktop-schemas gtk3 gtk4 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 095fe13f9197a..1998972cc2178 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,7 +1,7 @@ { newScope, config, stdenv, makeWrapper , buildPackages , ed, gnugrep, coreutils, xdg-utils -, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit +, glib, gtk3, gtk4, adwaita-icon-theme, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , runCommand , lib, libkrb5 @@ -101,7 +101,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 gtk4 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + adwaita-icon-theme # Needed for kerberos at runtime libkrb5 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 15c8ffc3b22d6..79df553d3ac2b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ ## various stuff that can be plugged in , ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc -, gnome/*.gnome-shell*/ +, adwaita-icon-theme , browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx-cast-bridge @@ -322,7 +322,7 @@ let --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ + --suffix XDG_DATA_DIRS : '${adwaita-icon-theme}/share' \ --set-default MOZ_ENABLE_WAYLAND 1 \ "''${oldWrapperArgs[@]}" ############################# diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 85d85ba2476b1..954bbf25e08d0 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,9 +10,11 @@ , darwin , cmake , ninja +, pkg-config , libxcrypt , python3 , qt6Packages +, woff2 , nixosTests , AppKit , Cocoa @@ -50,19 +52,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-06-04"; + version = "0-unstable-2024-06-08"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "c6e9f0e7b5b050ddbb5d735ca9c65458add9b4a5"; - hash = "sha256-+NDrd0kO9bqXFcCEJFmNwNu5jmf+wT+uUVlmbmCYLw4="; + rev = "2f68e361370040d8cdc75a8ed8af4239134ae481"; + hash = "sha256-EQZTsui4lGThSi+8a6KSyL5lJnO0A8fJ8HWY4jgkpUA="; }; - patches = [ - ./nixos-font-path.patch - ]; - postPatch = '' sed -i '/iconutil/d' Ladybird/CMakeLists.txt @@ -112,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = with qt6Packages; [ cmake ninja + pkg-config python3 wrapQtAppsHook ]; @@ -120,6 +119,9 @@ stdenv.mkDerivation (finalAttrs: { libxcrypt qtbase qtmultimedia + woff2 + ] ++ lib.optional stdenv.isLinux [ + qtwayland ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa @@ -163,5 +165,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ fgaz ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "Ladybird"; + # use of undeclared identifier 'NSBezelStyleAccessoryBarAction' + broken = stdenv.isDarwin; }; }) diff --git a/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch b/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch deleted file mode 100644 index 468eb10b2c313..0000000000000 --- a/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Userland/Libraries/LibCore/StandardPaths.cpp b/Userland/Libraries/LibCore/StandardPaths.cpp -index 77ddbeb9..76481497 100644 ---- a/Userland/Libraries/LibCore/StandardPaths.cpp -+++ b/Userland/Libraries/LibCore/StandardPaths.cpp -@@ -205,6 +205,7 @@ ErrorOr<Vector<String>> StandardPaths::font_directories() - "/Library/Fonts"_string, - TRY(String::formatted("{}/Library/Fonts"sv, home_directory())), - # else -+ "/run/current-system/sw/share/X11/fonts"_string, - "/usr/share/fonts"_string, - "/usr/local/share/fonts"_string, - TRY(String::formatted("{}/.local/share/fonts"sv, home_directory())), diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index b9a0b49bab2ba..edb62c692abe9 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -144,6 +144,14 @@ stdenv.mkDerivation rec { genericName = "Web Browser"; comment = meta.description; categories = [ "Network" "WebBrowser" "Security" ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; })]; buildPhase = '' diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index d5bd6a3e34b98..c594fa7328adb 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "110.0.5130.49"; + version = "111.0.5168.43"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-ge2ne11BrODlvbu17G6xaLd4w2mIEsErtIaqlLY4os8="; + hash = "sha256-BKtDxKPVu0RUG+DOrfZ1TpJMK/FopfQURTfQGNWE3rc="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index f19da4505789b..12b0c63b6afe4 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -163,6 +163,14 @@ stdenv.mkDerivation rec { genericName = "Web Browser"; comment = meta.description; categories = [ "Network" "WebBrowser" "Security" ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; })]; buildPhase = '' |