Unverified Commit 966f79be authored by Alyssa Ross's avatar Alyssa Ross
Browse files

pkgsMusl.ostree: fix build 

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: 1a56b351 ("ostree: version bump and removing old patches")
parent 5dd187f3

pkgs/tools/misc/ostree/default.nix

+14 −0
Original line number Diff line number Diff line 
{ 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