diff options
Diffstat (limited to 'pkgs/applications/networking/browsers')
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3197e272f0e2..8d0a59f29190 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -8,7 +8,7 @@ , libusb1, pciutils, nss, re2 , python2Packages, perl, pkg-config -, nspr, systemd, kerberos +, nspr, systemd, libkrb5 , util-linux, alsaLib , bison, gperf , glib, gtk3, dbus-glib @@ -135,7 +135,7 @@ let buildInputs = defaultDependencies ++ [ nspr nss systemd util-linux alsaLib - bison gperf kerberos + bison gperf libkrb5 glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 72e9746421b3..93b89e9031e0 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -13,7 +13,7 @@ , glibc , gtk2 , gtk3 -, kerberos +, libkrb5 , libX11 , libXScrnSaver , libxcb @@ -106,7 +106,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 mesa libX11 libXScrnSaver diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index ad9a4618dc81..3a8fec2c6efa 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -24,7 +24,7 @@ , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libxkbcommon , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages -, gssSupport ? true, kerberos +, gssSupport ? true, libkrb5 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire ## privacy-related options @@ -174,7 +174,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 - ++ lib.optional gssSupport kerberos + ++ lib.optional gssSupport libkrb5 ++ lib.optional waylandSupport libxkbcommon ++ lib.optional pipewireSupport pipewire ++ lib.optional (lib.versionAtLeast ffversion "82") gnum4 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ed88bf587d5f..26fb49ef2a3e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,7 +8,7 @@ , tridactyl-native , fx_cast_bridge , udev -, kerberos +, libkrb5 , libva , mesa # firefox wants gbm for drm+dmabuf }: @@ -65,7 +65,7 @@ let libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver ] ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional gssSupport kerberos + ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index b208ebf2ab03..d903cb3c0831 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -5,7 +5,7 @@ , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core -, kerberos, libdrm, mesa +, libkrb5, libdrm, mesa , libxkbcommon, wayland # ozone/wayland # Command line programs @@ -66,7 +66,7 @@ let liberation_ttf curl util-linux xdg-utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - kerberos libdrm mesa coreutils + libkrb5 libdrm mesa coreutils libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva |