about summary refs log tree commit diff
path: root/pkgs/misc/lilypond
diff options
context:
space:
mode:
authorOmid Momenzadeh <omid.mnzadeh@gmail.com>2021-10-04 13:23:52 +0330
committerEric Bailey <yurrriq@users.noreply.github.com>2021-10-10 02:13:55 -0500
commitc205944161d39753a1968aae010060e373a16336 (patch)
treea772cfe3726ebf5ff10fe5121fe322d0c41fb695 /pkgs/misc/lilypond
parent0c416075ae75e17db90c4c48d7394a36a8df824c (diff)
downloadnixlib-c205944161d39753a1968aae010060e373a16336.tar
nixlib-c205944161d39753a1968aae010060e373a16336.tar.gz
nixlib-c205944161d39753a1968aae010060e373a16336.tar.bz2
nixlib-c205944161d39753a1968aae010060e373a16336.tar.lz
nixlib-c205944161d39753a1968aae010060e373a16336.tar.xz
nixlib-c205944161d39753a1968aae010060e373a16336.tar.zst
nixlib-c205944161d39753a1968aae010060e373a16336.zip
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.
Diffstat (limited to 'pkgs/misc/lilypond')
-rw-r--r--pkgs/misc/lilypond/with-fonts.nix5
1 files 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
   '';
 })