From 0bfb88777b7f144838154ef4511f54709de974f3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 29 May 2026 01:39:46 +0200 Subject: [PATCH] minitube: migrate to pkgs/by-name --- .../mi/minitube/package.nix} | 18 +++++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 13 deletions(-) rename pkgs/{applications/video/minitube/default.nix => by-name/mi/minitube/package.nix} (88%) diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/by-name/mi/minitube/package.nix similarity index 88% rename from pkgs/applications/video/minitube/default.nix rename to pkgs/by-name/mi/minitube/package.nix index bf74970b64f0..252bb84e2af8 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/by-name/mi/minitube/package.nix @@ -2,11 +2,7 @@ lib, stdenv, fetchFromGitHub, - qmake, - qttools, - wrapQtAppsHook, - qtbase, - qtdeclarative, + qt6, mpv, # "Free" key generated by pasqui23 @@ -28,18 +24,18 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/214765 postPatch = '' substituteInPlace locale/locale.pri \ - --replace-fail '$$[QT_INSTALL_BINS]/lrelease' '${lib.getDev qttools}/bin/lrelease' + --replace-fail '$$[QT_INSTALL_BINS]/lrelease' '${lib.getDev qt6.qttools}/bin/lrelease' ''; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + qt6.qmake + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtdeclarative + qt6.qtbase + qt6.qtdeclarative mpv ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d0e11e21108..787ab3f2aa15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9552,8 +9552,6 @@ with pkgs; mercurialFull = mercurial.override { fullBuild = true; }; - minitube = kdePackages.callPackage ../applications/video/minitube { }; - mldonkey = callPackage ../applications/networking/p2p/mldonkey { ocamlPackages = ocaml-ng.ocamlPackages_4_14; };