Merge pull request #279793 from viraptor/cbfmt-clang

cbfmt: fix compilation with new clang
This commit is contained in:
Stanisław Pitucha 2024-01-10 00:23:52 +11:00 committed by GitHub
commit 487c554ea0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, testers, cbfmt }: { lib, rustPlatform, fetchFromGitHub, stdenv, testers, cbfmt }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cbfmt"; pname = "cbfmt";
@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo="; cargoSha256 = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo=";
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
env = lib.optionalAttrs stdenv.cc.isClang { NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; };
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {
package = cbfmt; package = cbfmt;
}; };