Unverified Commit d69e7b03 authored by Ramses's avatar Ramses Committed by GitHub
Browse files

lilypond: 2.24.4 -> 2.26.0 (#513713)

parents dfbcbf54 1f9b96af
Loading
Loading
Loading
Loading
+2 −15
Original line number Diff line number Diff line
@@ -41,12 +41,11 @@
    ]
  ),
  writeScript,
  fetchpatch2,
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "lilypond";
  version = "2.24.4";
  version = "2.26.0";
  outputs = [
    "out"
    "man"
@@ -54,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchzip {
    url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz";
    hash = "sha256-UYdORvodrVchxslOxpMiXrAh7DtB9sWp9yqZU/jeB9Y=";
    hash = "sha256-HUkPhaWNZ4UKbmlEyLXepHCFcgrdoRSDtjZMriO68RM=";
  };

  postInstall = ''
@@ -79,18 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
      --replace-fail "mem=mf2pt1" "mem=$PWD/mf/mf2pt1"
  '';

  patches = [
    # fixes #475503
    # distilled version of https://gitweb.git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commit;h=f2192eb294e
    # so, remove once that commit reaches a stable release
    (fetchpatch2 {
      name = "fix-clang-21-build.patch";
      url = "https://cgit.freebsd.org/ports/plain/print/lilypond/files/patch-lily_include_smobs.hh?id=58bab68c706086774b17dcacc61c8fd37ecc8a15";
      extraPrefix = ""; # adds old/new prefixes to process properly in patchPhase
      hash = "sha256-nT8+nYU+m6lLTvHEvSIpG/yAwy1Omb6+4Z+NGwEVE4Q=";
    })
  ];

  strictDeps = true;

  depsBuildBuild = [