From b6602c1d6827882d4c6458a6003a3a3663f279ca Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 22:52:07 +0100 Subject: [PATCH] minitube: 3.2 -> 3.6 rewrite without useless wrapQtAppsHook and stdenv --- pkgs/applications/video/minitube/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 690b8355340..a5bd030e470 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,30 +1,30 @@ -{ stdenv, fetchFromGitHub, wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, qmake +{ mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake , qtdeclarative, qttools, qtx11extras, mpv # "Free" key generated by nckx . I no longer have a Google # account. You'll need to generate (and please share :-) a new one if it breaks. , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "minitube"; - version = "3.2"; + version = "3.6"; src = fetchFromGitHub { - sha256 = "0175sgqmszakqd631bni4aqjpx68h6n49zjvg23fb1yyancnkn4c"; + sha256 = "6IaBPYL/yGWKUHxPe1FnAR1gDHImXYGItYWq7VNjwEU="; rev = version; repo = "minitube"; owner = "flaviotordini"; fetchSubmodules = true; }; - buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools qtx11extras mpv ]; - nativeBuildInputs = [ wrapQtAppsHook qmake ]; + buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ]; + nativeBuildInputs = [ qmake qttools ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Stand-alone YouTube video player"; longDescription = '' Watch YouTube videos in a new way: you type a keyword, Minitube gives diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3729afe648c..2865746bc07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22354,7 +22354,7 @@ in minishift = callPackage ../applications/networking/cluster/minishift { }; - minitube = libsForQt514.callPackage ../applications/video/minitube { }; + minitube = libsForQt5.callPackage ../applications/video/minitube { }; mimic = callPackage ../applications/audio/mimic { };