diff options
Diffstat (limited to 'pkgs/applications/audio/luppp')
| -rw-r--r-- | pkgs/applications/audio/luppp/build-install.patch | 16 | ||||
| -rw-r--r-- | pkgs/applications/audio/luppp/default.nix | 25 |
2 files changed, 16 insertions, 25 deletions
diff --git a/pkgs/applications/audio/luppp/build-install.patch b/pkgs/applications/audio/luppp/build-install.patch deleted file mode 100644 index 4dae65438cb..00000000000 --- a/pkgs/applications/audio/luppp/build-install.patch +++ /dev/null @@ -1,16 +0,0 @@ -commit 4ec09e6f6e00e40622a5207ed24dc657da9a9090 -Author: Pavol Rusnak <stick@gk2.sk> -Date: Tue Dec 4 12:06:22 2018 +0100 - - build: add install: true to executable in meson.build - -diff --git a/meson.build b/meson.build -index 050e1b1..9224ed5 100644 ---- a/meson.build -+++ b/meson.build -@@ -39,4 +39,5 @@ endforeach - - # compile the main project - executable('luppp', luppp_src + [version_hxx], -+ install: true, - dependencies: deps) diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix index c1494ffc333..36d329bcafd 100644 --- a/pkgs/applications/audio/luppp/default.nix +++ b/pkgs/applications/audio/luppp/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv +, fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , jack2 , cairo , liblo @@ -12,26 +13,32 @@ stdenv.mkDerivation rec { pname = "luppp"; - version = "1.2.0"; - patches = [ ./build-install.patch ]; + version = "1.2.1"; src = fetchFromGitHub { owner = "openAVproductions"; repo = "openAV-Luppp"; rev = "release-${version}"; - sha256 = "194yq0lqc2psq9vyxmzif40ccawcvd9jndcn18mkz4f8h5w5rc1a"; + sha256 = "1ncbn099fyfnr7jw2bp3wf2g9k738lw53m6ssw6wji2wxwmghv78"; }; nativeBuildInputs = [ - meson ninja pkgconfig + meson + ninja + pkg-config ]; buildInputs = [ - jack2 cairo liblo libsndfile libsamplerate ntk + jack2 + cairo + liblo + libsndfile + libsamplerate + ntk ]; - meta = with stdenv.lib; { - homepage = "http://openavproductions.com/luppp/"; + meta = with lib; { + homepage = "http://openavproductions.com/luppp/"; # https does not work description = "A music creation tool, intended for live use"; license = licenses.gpl3Plus; maintainers = with maintainers; [ prusnak ]; |