diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2020-10-02 22:25:16 +0200 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2020-11-23 09:12:31 +0100 |
| commit | f94ed4e9689dc84714889791ccee660be761b875 (patch) | |
| tree | ad653287b756ecfabceb6b2e1e5fb418573ddb37 | |
| parent | deb0943ec6ee910c7a6d375f19467db7fb04b674 (diff) | |
| download | nixpkgs-f94ed4e9689dc84714889791ccee660be761b875.tar nixpkgs-f94ed4e9689dc84714889791ccee660be761b875.tar.gz nixpkgs-f94ed4e9689dc84714889791ccee660be761b875.tar.bz2 nixpkgs-f94ed4e9689dc84714889791ccee660be761b875.tar.lz nixpkgs-f94ed4e9689dc84714889791ccee660be761b875.tar.xz nixpkgs-f94ed4e9689dc84714889791ccee660be761b875.tar.zst nixpkgs-f94ed4e9689dc84714889791ccee660be761b875.zip | |
luppp: 1.2.0 -> 1.2.1
drop upstreamed patch
| -rw-r--r-- | pkgs/applications/audio/luppp/build-install.patch | 16 | ||||
| -rw-r--r-- | pkgs/applications/audio/luppp/default.nix | 21 |
2 files changed, 14 insertions, 23 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..6cf2575b8e5 100644 --- a/pkgs/applications/audio/luppp/default.nix +++ b/pkgs/applications/audio/luppp/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub +{ stdenv +, fetchFromGitHub , meson , ninja , pkgconfig @@ -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 + pkgconfig ]; buildInputs = [ - jack2 cairo liblo libsndfile libsamplerate ntk + jack2 + cairo + liblo + libsndfile + libsamplerate + ntk ]; meta = with stdenv.lib; { - homepage = "http://openavproductions.com/luppp/"; + 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 ]; |