From 5f373708ddec0e1754fc7d69c2b5bbbf016f22ad Mon Sep 17 00:00:00 2001 From: Kyle Sferrazza Date: Wed, 6 Nov 2019 10:50:14 -0500 Subject: [PATCH] denemo: add WrapGAppsHook closes #52958 remove wrapProgram in favor of gappsWrapperArgs move gettext and pkgconfig to nativeBuildInputs --- pkgs/applications/audio/denemo/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index 331e3fb9698..f3adec4fece 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -2,7 +2,7 @@ , libjack2, gettext, intltool, guile_2_0, lilypond , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband -, portaudio, portmidi, fftw, makeWrapper }: +, portaudio, portmidi, fftw, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "denemo"; @@ -14,17 +14,21 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libjack2 gettext guile_2_0 lilypond pkgconfig glib libxml2 librsvg libsndfile + libjack2 guile_2_0 lilypond glib libxml2 librsvg libsndfile aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi - makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/denemo --prefix PATH : ${lilypond}/bin + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lilypond}/bin" + ) ''; nativeBuildInputs = [ + wrapGAppsHook intltool + gettext + pkgconfig ]; meta = with stdenv.lib; {