diff options
-rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 3048f047485..0ad125beb53 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -36,7 +36,7 @@ , pango , pipewire , pciutils -, libheimdal +, heimdal , libpulseaudio , systemd , channel @@ -134,7 +134,7 @@ stdenv.mkDerivation { pango pipewire pciutils - libheimdal + heimdal libpulseaudio systemd ffmpeg diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index ff93dd61351..9bd99c86e77 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -42,7 +42,7 @@ , pango , pipewire , pciutils -, libheimdal +, heimdal , libpulseaudio , systemd , writeScript @@ -137,7 +137,7 @@ stdenv.mkDerivation { pango pipewire pciutils - libheimdal + heimdal libpulseaudio systemd ffmpeg diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5086a129337..b1d46cc93b7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -754,6 +754,7 @@ mapAliases ({ libgpgerror = libgpg-error; # Added 2021-09-04 libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 libgumbo = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22 + libheimdal = heimdal; # Added 2022-11-18 libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 libixp_hg = libixp; libjpeg_drop = libjpeg_original; # Added 2020-06-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 232fc956386..c7c9dc29a73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18582,7 +18582,7 @@ with pkgs; cypress = callPackage ../development/web/cypress { }; cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { - libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5; + libkrb5 = if stdenv.isFreeBSD then heimdal else libkrb5; openssl = openssl_1_1; }; @@ -19501,7 +19501,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; autoreconfHook = buildPackages.autoreconfHook269; }; - libheimdal = heimdal; harfbuzz = callPackage ../development/libraries/harfbuzz { inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText; |