colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgsMusl.ostree: fix build

Browse Source 
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: 1a56b3515b ("ostree: version bump and removing old patches")
This commit is contained in:
Alyssa Ross 2024-04-25 09:20:12 +02:00
parent 5dd187f3b7
commit 966f79bea6
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/misc/ostree/default.nix
View File

@ -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