diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-04-25 11:08:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-25 11:08:11 +0200 |
| commit | baf439a2e9b94ae55a5906fe403a79aa3a492e4f (patch) | |
| tree | b8bb61ff093f5375909a694ab373e1ffbe06f2a8 /pkgs/tools | |
| parent | 680c13ed091a8e7d3bfff88a77b229982f60642a (diff) | |
| parent | 966f79bea66d16694316885ba5407a22e1c7bead (diff) | |
Merge pull request #306727 from alyssais/ostree-musl
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/ostree/default.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index aff0968b7f102..caccfbec9b699 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 |