From 30dc2309970c5aec7bde9093570137560502940c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 29 Mar 2020 10:22:55 +0000 Subject: [PATCH] avldrums-lv2: alias to x42-avldrums (#83665) Fixes #83649 --- .../audio/avldrums-lv2/default.nix | 29 ------------------- .../audio/x42-avldrums/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/audio/avldrums-lv2/default.nix diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix deleted file mode 100644 index d71718c32a8..00000000000 --- a/pkgs/applications/audio/avldrums-lv2/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }: - -stdenv.mkDerivation rec { - pname = "avldrums.lv2"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "x42"; - repo = pname; - rev = "v${version}"; - sha256 = "1z70rcq6z3gkb4fm8dm9hs31bslwr97zdh2n012fzki9b9rdj5qv"; - fetchSubmodules = true; - }; - - installFlags = [ "PREFIX=$(out)" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - pango cairo libGLU lv2 - ]; - - meta = with stdenv.lib; { - description = "Dedicated AVLDrumkits LV2 Plugin"; - homepage = http://x42-plugins.com/x42/x42-avldrums; - license = licenses.gpl2; - maintainers = [ maintainers.magnetophon ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index 5de51e23d73..b34062672f9 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums"; homepage = https://x42-plugins.com/x42/x42-avldrums; - maintainers = with maintainers; [ orivej ]; + maintainers = with maintainers; [ magnetophon orivej ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c81a51ae4da..88e7d4d9e84 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -46,6 +46,7 @@ mapAliases ({ asciidocFull = asciidoc-full; # added 2014-06-22 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 + avldrums-lv2 = x42-avldrums; # added 2020-03-29 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab765f45d8f..8d6eb691acd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -718,8 +718,6 @@ in avfs = callPackage ../tools/filesystems/avfs { }; - avldrums-lv2 = callPackage ../applications/audio/avldrums-lv2 { }; - aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; awscli = callPackage ../tools/admin/awscli { };