diff options
Diffstat (limited to 'pkgs/applications')
13 files changed, 26 insertions, 26 deletions
diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 9472af7a16f..56894a29a66 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -12,7 +12,7 @@ , at-spi2-atk , gnutar , atomEnv -, kerberos +, libkrb5 }: # from justinwoo/azuredatastudio-nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { at-spi2-core at-spi2-atk stdenv.cc.cc.lib - kerberos + libkrb5 ] ) targetPath diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3197e272f0e..8d0a59f2919 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 72e9746421b..93b89e9031e 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 ad9a4618dc8..3a8fec2c6ef 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 ed88bf587d5..26fb49ef2a3 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 b208ebf2ab0..d903cb3c083 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 diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 53209d2edd6..a1d4b146837 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, util-linux -, coreutils, kerberos, ncurses, clang, installShellFiles +, coreutils, libkrb5, ncurses, clang, installShellFiles , components ? [ "cmd/oc" "cmd/openshift" @@ -33,7 +33,7 @@ in buildGoPackage rec { goPackagePath = "github.com/openshift/origin"; - buildInputs = [ kerberos ncurses ]; + buildInputs = [ libkrb5 ncurses ]; nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index 62882818d72..d169e1fdea6 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos +{lib, stdenv, fetchurl, ncurses, tcl, openssl, pam, libkrb5 , openldap }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses tcl openssl pam kerberos openldap + ncurses tcl openssl pam libkrb5 openldap ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index eecf8f0f67e..27c06c95d99 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -4,7 +4,7 @@ , cyrus_sasl ? null , gnupg ? null , gpgme ? null -, kerberos ? null +, libkrb5 ? null , headerCache ? true , sslSupport ? true , saslSupport ? true @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { [ ncurses which perl ] ++ optional headerCache gdbm ++ optional sslSupport openssl - ++ optional gssSupport kerberos + ++ optional gssSupport libkrb5 ++ optional saslSupport cyrus_sasl ++ optional gpgmeSupport gpgme; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 0c02f512dad..b2187371f29 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which -, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl +, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cyrus_sasl gss gpgme kerberos libidn ncurses + cyrus_sasl gss gpgme libkrb5 libidn ncurses notmuch openssl perl lmdb mailcap sqlite ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix index 5e2c74fb3f1..dda6abac8e5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -16,7 +16,7 @@ , glibc , gtk2 , gtk3 -, kerberos +, libkrb5 , libX11 , libXScrnSaver , libXcomposite @@ -94,7 +94,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 libX11 libXScrnSaver libXcomposite diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f9027285c13..d16cbfc1bca 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -20,7 +20,7 @@ , gpgme , gtk2 , gtk3 -, kerberos +, libkrb5 , libcanberra , libGL , libGLU @@ -93,7 +93,7 @@ stdenv.mkDerivation { glibc gtk2 gtk3 - kerberos + libkrb5 libX11 libXScrnSaver libXcomposite diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix index acfacadd55e..96c66f054e2 100644 --- a/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -1,6 +1,6 @@ { stdenv, lib , makeWrapper, dpkg, fetchurl, autoPatchelfHook -, curl, kerberos, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking +, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc.lib - kerberos + libkrb5 curl lttng-ust libpulseaudio |