From 83a615f695688887f0a77803c48736898188115a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 28 May 2023 02:40:50 +0300 Subject: [PATCH] bore: fix build on darwin --- pkgs/tools/networking/bore/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index e7934428a95..c3ae7846689 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromBitbucket, llvmPackages, Libsystem, SystemConfiguration, installShellFiles }: +{ lib, stdenv, rustPlatform, fetchFromBitbucket, Libsystem, SystemConfiguration, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "bore"; @@ -14,20 +14,21 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1xlbfzmy0wjyz3jpr17r4ma4i79d9b32yqwwi10vrcjzr7vsyhmx"; cargoBuildFlags = [ "-p" pname ]; + # error[E0793]: reference to packed field is unaligned + doCheck = !stdenv.isDarwin; + # FIXME can’t test --all-targets and --doc in a single invocation cargoTestFlags = [ "--all-targets" "--workspace" ]; checkFeatures = [ "std" ]; nativeBuildInputs = [ installShellFiles ] - ++ lib.optional stdenv.isDarwin llvmPackages.libclang; + ++ lib.optional stdenv.isDarwin rustPlatform.bindgenHook; buildInputs = lib.optionals stdenv.isDarwin [ Libsystem SystemConfiguration ]; - LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; - postInstall = '' installManPage $src/bore/doc/bore.1 '';