Skip to content

pkgsMusl.ostree: fix build #306727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 1 commit into from
Apr 25, 2024
Merged

pkgsMusl.ostree: fix build #306727

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions pkgs/tools/misc/ostree/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, substituteAll
, pkg-config
, gtk-doc
Expand Down Expand Up @@ -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
Expand Down