* [PATCH] Fix valgrind build with Musl
@ 2022-05-18 12:19 Ivan Nikolaenko
2022-05-18 13:43 ` Alyssa Ross
0 siblings, 1 reply; 2+ messages in thread
From: Ivan Nikolaenko @ 2022-05-18 12:19 UTC (permalink / raw)
To: devel; +Cc: Ivan Nikolaenko
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix valgrind build with Musl
2022-05-18 12:19 [PATCH] Fix valgrind build with Musl Ivan Nikolaenko
@ 2022-05-18 13:43 ` Alyssa Ross
0 siblings, 0 replies; 2+ messages in thread
From: Alyssa Ross @ 2022-05-18 13:43 UTC (permalink / raw)
To: Ivan Nikolaenko; +Cc: devel
[-- Attachment #1: Type: text/plain, Size: 1040 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-18 13:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-18 12:19 [PATCH] Fix valgrind build with Musl Ivan Nikolaenko
2022-05-18 13:43 ` Alyssa Ross
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).