Skip to content

Commit

Permalink
Revert "pkgsMusl.ostree: fix build"
Browse files Browse the repository at this point in the history
This reverts commit 966f79b.

We've now updated musl to a version that has statx available.
  • Loading branch information
alyssais committed Sep 20, 2024
1 parent dffd226 commit efcd97f
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions pkgs/tools/misc/ostree/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, pkg-config
, gtk-doc
, gobject-introspection
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit efcd97f

Please sign in to comment.