From 61ccd7ea75ba85594eb116069d058e6e9828c750 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sun, 8 Jun 2025 19:11:54 -0700 Subject: [PATCH 1/4] stdenv/freebsd: add missing rewriteURL parameter --- pkgs/stdenv/freebsd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index b52c8ea372446..568fe19bd44f7 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -501,6 +501,7 @@ in inherit lib; inherit (self) stdenvNoCC; inherit (prevStage) curl; + inherit (config) rewriteURL; }; gettext = super.gettext.overrideAttrs { NIX_CFLAGS_COMPILE = "-DHAVE_ICONV=1"; # we clearly have iconv. what do you want? From 344411f02ca9fd13162c5d14858de467ed6c6d0b Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sun, 8 Jun 2025 19:39:45 -0700 Subject: [PATCH 2/4] fakeroot: only include libcap on linux --- pkgs/by-name/fa/fakeroot/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fa/fakeroot/package.nix b/pkgs/by-name/fa/fakeroot/package.nix index 4148809112210..a7fbca8e33052 100644 --- a/pkgs/by-name/fa/fakeroot/package.nix +++ b/pkgs/by-name/fa/fakeroot/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { autoreconfHook po4a ]; - buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) libcap; + buildInputs = lib.optional stdenv.hostPlatform.isLinux libcap; postUnpack = '' sed -i \ From a2f45eecc1321263707bb62ca6d781d6794f1c3c Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sun, 8 Jun 2025 19:40:20 -0700 Subject: [PATCH 3/4] freebsd.filterSource: don't build rsync with tests --- .../bsd/freebsd/pkgs/filterSource.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix b/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix index 09674056d9cd8..80dad06be8f8c 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix @@ -21,12 +21,17 @@ in runCommand "${pname}-filtered-src" { nativeBuildInputs = [ - (pkgsBuildBuild.rsync.override { - enableZstd = false; - enableXXHash = false; - enableOpenSSL = false; - enableLZ4 = false; - }) + ( + (pkgsBuildBuild.rsync.override { + enableZstd = false; + enableXXHash = false; + enableOpenSSL = false; + enableLZ4 = false; + }).overrideAttrs + { + doCheck = false; + } + ) ]; } '' From ec7b23cc8a9df4d738b347e91a44de2533097426 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sun, 8 Jun 2025 19:40:48 -0700 Subject: [PATCH 4/4] stdenv/freebsd: provide libiconv for early boot --- pkgs/stdenv/freebsd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 568fe19bd44f7..7485cf1ce6eba 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -230,6 +230,7 @@ let ]; }; iconv = linkBootstrap { paths = [ "bin/iconv" ]; }; + libiconv = linkBootstrap { paths = [ "include/iconv.h" ]; }; patch = linkBootstrap { paths = [ "bin/patch" ]; }; gnutar = linkBootstrap { paths = [ "bin/tar" ]; }; gawk = linkBootstrap { @@ -486,6 +487,7 @@ in diffutils findutils iconv + libiconv patch gnutar gawk