cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #201705 from helsinki-systems/unalias-libheimdail

Browse source 
libheimdal: turn into proper alias
This commit is contained in:
ajs124 2022-11-20 14:42:19 +01:00 committed by GitHub
commit 0fc1a5a0cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox-bin/default.nix
View file

@ -36,7 +36,7 @@
, pango , pango
, pipewire , pipewire
, pciutils , pciutils
, libheimdal , heimdal
, libpulseaudio , libpulseaudio
, systemd , systemd
, channel , channel
@ -134,7 +134,7 @@ stdenv.mkDerivation {
pango pango
pipewire pipewire
pciutils pciutils
libheimdal heimdal
libpulseaudio libpulseaudio
systemd systemd
ffmpeg ffmpeg

4
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View file

@ -42,7 +42,7 @@
, pango , pango
, pipewire , pipewire
, pciutils , pciutils
, libheimdal , heimdal
, libpulseaudio , libpulseaudio
, systemd , systemd
, writeScript , writeScript
@ -137,7 +137,7 @@ stdenv.mkDerivation {
pango pango
pipewire pipewire
pciutils pciutils
libheimdal heimdal
libpulseaudio libpulseaudio
systemd systemd
ffmpeg ffmpeg

1
pkgs/top-level/aliases.nix
View file

@ -757,6 +757,7 @@ mapAliases ({
libgpgerror = libgpg-error; # Added 2021-09-04 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 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 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 libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14
libixp_hg = libixp; libixp_hg = libixp;
libjpeg_drop = libjpeg_original; # Added 2020-06-05 libjpeg_drop = libjpeg_original; # Added 2020-06-05

3
pkgs/top-level/all-packages.nix
View file

@ -18581,7 +18581,7 @@ with pkgs;
cypress = callPackage ../development/web/cypress { }; cypress = callPackage ../development/web/cypress { };
cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { 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; openssl = openssl_1_1;
}; };
@ -19498,7 +19498,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
autoreconfHook = buildPackages.autoreconfHook269; autoreconfHook = buildPackages.autoreconfHook269;
}; };
libheimdal = heimdal;
harfbuzz = callPackage ../development/libraries/harfbuzz { harfbuzz = callPackage ../development/libraries/harfbuzz {
inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText; inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreText;