diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/by-name/mp/mpc-qt/package.nix similarity index 57% rename from pkgs/applications/video/mpc-qt/default.nix rename to pkgs/by-name/mp/mpc-qt/package.nix index 7868257ffda7..1d4ebaf8bf68 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/by-name/mp/mpc-qt/package.nix @@ -3,30 +3,27 @@ stdenv, fetchFromGitHub, pkg-config, - qmake, - qttools, - qtbase, + qt6Packages, mpv, - wrapQtAppsHook, gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mpc-qt"; version = "24.12.1-flatpak"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-gn94kVs3Lbd+ggj4jTacHpmnVO2lH/QDhFk+hJC1N/c="; }; nativeBuildInputs = [ pkg-config - qmake - qttools - wrapQtAppsHook + qt6Packages.qmake + qt6Packages.qttools + qt6Packages.wrapQtAppsHook ]; buildInputs = [ @@ -34,26 +31,26 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace lconvert.pri --replace "qtPrepareTool(LCONVERT, lconvert)" "qtPrepareTool(LCONVERT, lconvert, , , ${qttools}/bin)" + substituteInPlace lconvert.pri --replace "qtPrepareTool(LCONVERT, lconvert)" "qtPrepareTool(LCONVERT, lconvert, , , ${qt6Packages.qttools}/bin)" ''; postConfigure = '' - substituteInPlace Makefile --replace ${qtbase}/bin/lrelease ${qttools.dev}/bin/lrelease + substituteInPlace Makefile --replace ${qt6Packages.qtbase}/bin/lrelease ${qt6Packages.qttools.dev}/bin/lrelease ''; qmakeFlags = [ - "MPCQT_VERSION=${version}" + "MPCQT_VERSION=${finalAttrs.version}" ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "Media Player Classic Qute Theater"; homepage = "https://mpc-qt.github.io"; - license = licenses.gpl2; - platforms = platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; - maintainers = with maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ romildo ]; mainProgram = "mpc-qt"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8f1572084d1..2092433f873c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13204,8 +13204,6 @@ with pkgs; # a somewhat more maintained fork of ympd memento = qt6Packages.callPackage ../applications/video/memento { }; - mpc-qt = qt6Packages.callPackage ../applications/video/mpc-qt { }; - mplayer = callPackage ../applications/video/mplayer ( { libdvdnav = libdvdnav_4_2_1;