From 966f79bea66d16694316885ba5407a22e1c7bead Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 25 Apr 2024 09:20:12 +0200
Subject: [PATCH] pkgsMusl.ostree: fix build

Nixpkgs currently uses musl 1.2.3, which does not provide a statx(2)
wrapper, which ostree now depends upon.  Work on upgrading musl is
ongoing, but for now, to keep ostree building, let's follow upstream's
recommendation and revert the statx changes.  Once the musl upgrade is
complete, this change can be reverted.

I've applied the patches conditionally, only for musl, to avoid
impacting functionality for other platforms.

Fixes: 1a56b3515b84 ("ostree: version bump and removing old patches")
---
 pkgs/tools/misc/ostree/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index aff0968b7f10..caccfbec9b69 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, fetchpatch
 , substituteAll
 , pkg-config
 , gtk-doc
@@ -51,6 +52,19 @@ in stdenv.mkDerivation rec {
     sha256 = "sha256-Y8kZCCEzOsc3Pg2SPkwnZrJevc/fTvtEy1koxlidn8s=";
   };
 
+  patches = lib.optionals stdenv.hostPlatform.isMusl [
+    # > I guess my inclination here is to recommend that musl users
+    # > carry a downstream patch to revert the commits in #3175 until
+    # > such time as they can update to the new musl.
+    # https://github.com/ostreedev/ostree/issues/3200#issuecomment-1974819192
+    (fetchpatch {
+      name = "revert-statx.diff";
+      url = "https://github.com/ostreedev/ostree/commit/f46cc0cd85b564e40e03c7438a41c8e57f6b836c.diff";
+      excludes = [ "ci/*" ];
+      revert = true;
+      hash = "sha256-LsXbRYh4hfjNdt1S384IPlSvtC5f2rgSTZEkIIBkT0g=";
+    })
+  ];
 
   nativeBuildInputs = [
     autoconf