From 17af0c2ea3e70c04d4cbfd601b25afa51e96733a Mon Sep 17 00:00:00 2001 From: zendo Date: Wed, 5 Apr 2023 11:15:46 +0800 Subject: [PATCH] media-downloader: 2.9.0 -> 3.1.0 --- .../video/media-downloader/default.nix | 36 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index ab7f9030faa8..6eb8aad6d8ff 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -2,38 +2,48 @@ , stdenv , fetchFromGitHub , cmake -, qt5 -, ffmpeg-full +, wrapQtAppsHook +, qtbase , aria2 -, yt-dlp +, ffmpeg , python3 +, yt-dlp }: stdenv.mkDerivation rec { pname = "media-downloader"; - version = "2.9.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = pname; rev = "${version}"; - sha256 = "sha256-3tVOyIwdGcSVnEJWQWh6HIsjY6uEzWkTs45qf81r/+0="; + hash = "sha256-/oKvjmLFchR2B/mcLIUVIHBK78u2OQGf2aiwVR/ZoQc="; }; - nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; - preFixup = '' - qtWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ ffmpeg-full aria2 yt-dlp python3 ]}" - ) - ''; + buildInputs = [ + qtbase + ]; + + qtWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ + aria2 + ffmpeg + python3 + yt-dlp + ]}" + ]; meta = with lib; { description = "A Qt/C++ GUI front end to youtube-dl"; homepage = "https://github.com/mhogomchungu/media-downloader"; license = licenses.gpl2Plus; - broken = stdenv.isDarwin; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ zendo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6fd775006e6..c24ee6fc52da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31820,7 +31820,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - media-downloader = callPackage ../applications/video/media-downloader { }; + media-downloader = libsForQt5.callPackage ../applications/video/media-downloader { }; mediaelch = mediaelch-qt5; mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { };