From 0893176e14865d016bd7744a5b084e8e878c6636 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 17 Dec 2022 13:26:17 -0500 Subject: [PATCH] matrix-conduit: unbreak on darwin, remove unused inputs --- pkgs/servers/matrix-conduit/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index a3d4267b259f..165bdaf77372 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, rustPlatform, pkg-config, rocksdb }: +{ lib, rustPlatform, fetchFromGitLab, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "matrix-conduit"; @@ -15,20 +15,20 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook - pkg-config ]; - buildInputs = [ - rocksdb + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security ]; - cargoBuildFlags = [ "--bin" "conduit" ]; + # tests failed on x86_64-darwin with SIGILL: illegal instruction + doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); meta = with lib; { - broken = stdenv.isDarwin; description = "A Matrix homeserver written in Rust"; homepage = "https://conduit.rs/"; license = licenses.asl20; maintainers = with maintainers; [ pstn piegames pimeys ]; + mainProgram = "conduit"; }; }