diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix deleted file mode 100644 index 8ad35f34f7ea..000000000000 --- a/pkgs/applications/audio/jamulus/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ mkDerivation -, lib -, fetchFromGitHub -, pkg-config -, qtscript -, qmake -, qtbase -, qtmultimedia -, qtdeclarative -, libjack2 -}: - -mkDerivation rec { - pname = "jamulus"; - version = "3.10.0"; - src = fetchFromGitHub { - owner = "jamulussoftware"; - repo = "jamulus"; - rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-uqBre1Hcdmmifm/gii3MlP9LiAovQVsAaPZTmVm1nnM="; - }; - - nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ - qtscript - qtbase - qtmultimedia - qtdeclarative - libjack2 - ]; - - qmakeFlags = [ "CONFIG+=noupcasename" ]; - - meta = { - description = "Enables musicians to perform real-time jam sessions over the internet"; - longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details"; - homepage = "https://github.com/corrados/jamulus/wiki"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - mainProgram = "jamulus"; - maintainers = [ lib.maintainers.seb314 ]; - }; -} diff --git a/pkgs/by-name/ja/jamulus/package.nix b/pkgs/by-name/ja/jamulus/package.nix new file mode 100644 index 000000000000..32166e15f465 --- /dev/null +++ b/pkgs/by-name/ja/jamulus/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + libsForQt5, + libjack2, +}: +stdenv.mkDerivation rec { + pname = "jamulus"; + version = "3.11.0"; + + src = fetchFromGitHub { + owner = "jamulussoftware"; + repo = "jamulus"; + tag = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-YxXSSVm3n96YzE51cXpWf4z2nQBSguvcEp/kU0a6iBA="; + }; + + nativeBuildInputs = [ + pkg-config + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = [ + libsForQt5.qtscript + libsForQt5.qtbase + libsForQt5.qtmultimedia + libsForQt5.qtdeclarative + libjack2 + ]; + + qmakeFlags = [ "CONFIG+=noupcasename" ]; + + meta = { + description = "Enables musicians to perform real-time jam sessions over the internet"; + longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details"; + homepage = "https://github.com/corrados/jamulus"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + mainProgram = "jamulus"; + maintainers = with lib.maintainers; [ seb314 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb0f6d6122bf..27d706ce16a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3785,8 +3785,6 @@ with pkgs; iaito = libsForQt5.callPackage ../tools/security/iaito { }; - jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; - icemon = libsForQt5.callPackage ../applications/networking/icemon { }; icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak;