From 214942d52b19a005f8f0dc406da29d76e12084d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Tue, 25 Mar 2025 09:24:03 -0400 Subject: [PATCH] lilypond: modernise --- pkgs/misc/lilypond/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 3892a3d733b6..07a0a42eff1e 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-6W+gNXHHnyDhl5ZTr6vb5O5Cdlo9n9FJU/DNnupReBw="; + hash = "sha256-6W+gNXHHnyDhl5ZTr6vb5O5Cdlo9n9FJU/DNnupReBw="; }; postInstall = '' @@ -76,7 +76,8 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl + substituteInPlace scripts/build/mf2pt1.pl \ + --replace-fail "mem=mf2pt1" "mem=$PWD/mf/mf2pt1" export HOME=$TMPDIR/home ''; @@ -121,15 +122,15 @@ stdenv.mkDerivation rec { supportedFeatures = [ "commit" ]; }; - meta = with lib; { + meta = { description = "Music typesetting system"; homepage = "http://lilypond.org/"; - license = licenses.gpl3; - maintainers = with maintainers; [ + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ marcweber yurrriq ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; FONTCONFIG_FILE = lib.optional stdenv.hostPlatform.isDarwin (makeFontsConf {