diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/by-name/mu/muse/package.nix similarity index 93% rename from pkgs/applications/audio/muse/default.nix rename to pkgs/by-name/mu/muse/package.nix index 5bf3612596b2..411bc19c4c0f 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/by-name/mu/muse/package.nix @@ -5,8 +5,6 @@ cmake, extra-cmake-modules, pkg-config, - qttools, - wrapQtAppsHook, alsa-lib, dssi, fluidsynth, @@ -20,11 +18,11 @@ lilv, lrdf, lv2, - qtsvg, rtaudio, rubberband, sord, serd, + libsForQt5, }: stdenv.mkDerivation (finalAttrs: { @@ -34,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "muse-sequencer"; repo = "muse"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-LxibuqopMHuKEfTWXSEXc1g3wTm2F3NQRiV71FHvaY0="; }; @@ -44,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { cmake extra-cmake-modules pkg-config - qttools - wrapQtAppsHook + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; buildInputs = [ @@ -62,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { lilv lrdf lv2 - qtsvg + libsForQt5.qtsvg rtaudio rubberband sord diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 248202caea78..08eda57a5239 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14290,8 +14290,6 @@ with pkgs; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; - muse = libsForQt5.callPackage ../applications/audio/muse { }; - nixDependencies = recurseIntoAttrs ( callPackage ../tools/package-management/nix/dependencies-scope.nix { } );