From efcd97fd88a1846530be897127fe70bf4513a71d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 28 Apr 2024 12:26:08 +0200 Subject: [PATCH] Revert "pkgsMusl.ostree: fix build" This reverts commit 966f79bea66d16694316885ba5407a22e1c7bead. We've now updated musl to a version that has statx available. --- pkgs/tools/misc/ostree/default.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 7b9d9ac51e129..a3fda662614e1 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , gtk-doc , gobject-introspection @@ -51,19 +50,6 @@ 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