[PATCH] Fix valgrind build with Musl
Musl does not support __THROW macro, so need to define this empty. Signed-off-by: Ivan Nikolaenko <ivan.nikolaenko@unikie.com> --- pkgs/development/tools/analysis/valgrind/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 6e736df235f..8e04e0c8520 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { url = "https://bugsfiles.kde.org/attachment.cgi?id=143535"; sha256 = "036zyk30rixjvpylw3c7n171n4gpn6zcp7h6ya2dz4h5r478l9i6"; }) + (fetchpatch { + url = "https://bugsfiles.kde.org/attachment.cgi?id=148912"; + sha256 = "Za+7K93pgnuEUQ+jDItEzWlN0izhbynX2crSOXBBY/I="; + }) ]; outputs = [ "out" "dev" "man" "doc" ]; -- 2.25.1
On Wed, May 18, 2022 at 03:19:24PM +0300, Ivan Nikolaenko wrote:
Musl does not support __THROW macro, so need to define this empty.
Signed-off-by: Ivan Nikolaenko <ivan.nikolaenko@unikie.com>
Thanks for the patch! Would you mind submitting it to upstream Nixpkgs? [1] It's a small change, so shouldn't be difficult to get upstream. (I can probably just merge it myself.) Once it's accepted upstream, we can cherry-pick it into Spectrum's nixpkgs, or update Spectrum's nixpkgs to a version that includes the fix. This way, we minimize how much Spectrum's nixpkgs is diverged from upstream. If it ends up being more difficult to upstream than I expect (e.g. if somebody objects for some reason), then I'll happily just commit it to Spectrum nixpkgs. When you open the Nixpkgs PR, please CC me. My GitHub username is @alyssais. Nixpkgs is quite picky about commit message format, so make sure to look at the examples in the documentation linked below. [1]: https://nixos.org/manual/nixpkgs/unstable/#chap-submitting-changes
participants (2)
-
Alyssa Ross -
Ivan Nikolaenko