Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b3a4f747137a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4a3a31be57a3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 15, 2019

  1. denemo: add WrapGAppsHook 

    closes #52958

remove wrapProgram in favor of gappsWrapperArgs
move gettext and pkgconfig to nativeBuildInputs
    @kylesferrazza
    kylesferrazza committed Nov 15, 2019
    Copy the full SHA
    5f37370 View commit details

  2. Merge pull request #72903 from kylesferrazza/fix-52958 

    denemo: add WrapGAppsHook
    @jtojnar
    jtojnar authored Nov 15, 2019
    Copy the full SHA
    4a3a31b View commit details
Showing with 9 additions and 5 deletions.
  1. +9 −5 pkgs/applications/audio/denemo/default.nix
14 changes: 9 additions & 5 deletions pkgs/applications/audio/denemo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {