diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-29 11:04:32 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-29 11:04:32 +0200 |
commit | 9b09b832fc390b306611b6ec3bfffcc4452629fe (patch) | |
tree | fdabeb08c70115d8e532625c42cdcc0dae154c02 /pkgs/applications/video | |
parent | c8f2427c4fde8d319be37ddacdaa05c255782729 (diff) | |
parent | 0d956a673d662bba236ee85dd5220c770ad29655 (diff) | |
download | nixpkgs-9b09b832fc390b306611b6ec3bfffcc4452629fe.tar nixpkgs-9b09b832fc390b306611b6ec3bfffcc4452629fe.tar.gz nixpkgs-9b09b832fc390b306611b6ec3bfffcc4452629fe.tar.bz2 nixpkgs-9b09b832fc390b306611b6ec3bfffcc4452629fe.tar.lz nixpkgs-9b09b832fc390b306611b6ec3bfffcc4452629fe.tar.xz nixpkgs-9b09b832fc390b306611b6ec3bfffcc4452629fe.tar.zst nixpkgs-9b09b832fc390b306611b6ec3bfffcc4452629fe.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/minitube/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index a9876da234f..f1f757d588f 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, qmake -, qtdeclarative, qttools +, qtdeclarative, qttools, qtx11extras, mpv # "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google # account. You'll need to generate (and please share :-) a new one if it breaks. @@ -7,16 +7,17 @@ stdenv.mkDerivation rec { pname = "minitube"; - version = "2.9"; + version = "3.2"; src = fetchFromGitHub { - sha256 = "11zkmwqadlgrrghs3rxq0h0fllfnyd3g09d7gdd6vd9r1a1yz73f"; + sha256 = "0175sgqmszakqd631bni4aqjpx68h6n49zjvg23fb1yyancnkn4c"; rev = version; repo = "minitube"; owner = "flaviotordini"; + fetchSubmodules = true; }; - buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools ]; + buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools qtx11extras mpv ]; nativeBuildInputs = [ wrapQtAppsHook qmake ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; |