Skip to content

top-level/all-packages: misc changes to support native FreeBSD #311789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 3 commits into from
May 19, 2024
Merged

top-level/all-packages: misc changes to support native FreeBSD #311789

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d469674
top-level/all-packages: Adjust bootstrap perl and coreutils to work f…
rhelmot May 17, 2024
51c1a3e
top-level/all-packages: Remove FreeBSD special case for cyrus_sasl
rhelmot May 17, 2024
6b39c14
top-level/all-packages: Add case for providing iconv bin on FreeBSD
rhelmot May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,15 +1146,15 @@ with pkgs;
fetchurl = stdenv.fetchurlBoot;
};
});
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
perl = buildPackages.perl.override { inherit zlib; fetchurl = stdenv.fetchurlBoot; };
openssl = buildPackages.openssl.override {
fetchurl = stdenv.fetchurlBoot;
buildPackages = {
coreutils = buildPackages.coreutils.override {
fetchurl = stdenv.fetchurlBoot;
inherit perl;
xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
gmp = null;
gmpSupport = false;
aclSupport = false;
attrSupport = false;
};
Expand Down Expand Up @@ -20443,9 +20443,7 @@ with pkgs;

cypress = callPackage ../development/web/cypress { };

cyrus_sasl = callPackage ../development/libraries/cyrus-sasl {
libkrb5 = if stdenv.isFreeBSD then heimdal else libkrb5;
};
cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };

cyrus-sasl-xoauth2 = callPackage ../development/libraries/cyrus-sasl-xoauth2 { };

Expand Down Expand Up @@ -22486,6 +22484,8 @@ with pkgs;
lib.getBin stdenv.cc.libc
else if stdenv.hostPlatform.isDarwin then
lib.getBin libiconv
else if stdenv.hostPlatform.isFreeBSD then
lib.getBin freebsd.iconv
else
lib.getBin libiconvReal;

Expand Down