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 \ 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; + } + ) ]; } '' diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index b52c8ea372446..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 @@ -501,6 +503,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?