From c205944161d39753a1968aae010060e373a16336 Mon Sep 17 00:00:00 2001 From: Omid Momenzadeh Date: Mon, 4 Oct 2021 13:23:52 +0330 Subject: [PATCH] lilypond-with-fonts: fix lilypond not finding its libraries Fixes #140152. The fix is inspired by how lilypond-with-fonts was packaged in v18.09. --- pkgs/misc/lilypond/with-fonts.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 47cbb59f2f01..2cfd1519795d 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -1,4 +1,4 @@ -{ lib, lndir, symlinkJoin, makeWrapper +{ lib, symlinkJoin, makeWrapper , lilypond, openlilylib-fonts }: @@ -8,11 +8,10 @@ lib.appendToName "with-fonts" (symlinkJoin { paths = [ lilypond ] ++ openlilylib-fonts.all; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ lndir ]; postBuild = '' for p in $out/bin/*; do - wrapProgram "$p" --set LILYPOND_DATADIR "$datadir" + wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}" done ''; })