diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index f23fa34b87be..e7df375495a0 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -8,6 +8,7 @@ , rust-jemalloc-sys , nix-update-script , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { @@ -30,17 +31,24 @@ rustPlatform.buildRustPackage rec { }; }; - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl rust-jemalloc-sys - ] ++ lib.optionals stdenv.isDarwin [ Security ]; + ] ++ lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + ]; nativeBuildInputs = [ protobuf rustPlatform.bindgenHook pkg-config ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env = { + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-faligned-allocation"; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 620228dba2b7..6ba7f1e7fef0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12513,7 +12513,7 @@ with pkgs; qarte = libsForQt5.callPackage ../applications/video/qarte { }; qdrant = darwin.apple_sdk_11_0.callPackage ../servers/search/qdrant { - inherit (darwin.apple_sdk_11_0.frameworks) Security; + inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration; }; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };