public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39977 from Ma27/update-minitube

Browse Source 
minitube: 2.4 -> 2.9
This commit is contained in:
xeji 2018-05-04 22:01:14 +02:00 committed by GitHub
commit 5c63fbdafb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/video/minitube/default.nix
View File

@ -1,21 +1,23 @@
{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook { stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qtbase, qmake
, qtdeclarative, qttools
# "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google # "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. # account. You'll need to generate (and please share :-) a new one if it breaks.
, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "minitube-${version}"; name = "minitube-${version}";
version = "2.4"; version = "2.9";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5"; sha256 = "11zkmwqadlgrrghs3rxq0h0fllfnyd3g09d7gdd6vd9r1a1yz73f";
rev = version; rev = version;
repo = "minitube"; repo = "minitube";
owner = "flaviotordini"; owner = "flaviotordini";
}; };
buildInputs = [ phonon phonon-backend-vlc qt4 ]; buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools ];
nativeBuildInputs = [ makeWrapper qmake4Hook ]; nativeBuildInputs = [ makeWrapper qmake ];
qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/minitube \ wrapProgram $out/bin/minitube \
--prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/kde4/plugins" --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/qt-5.${stdenv.lib.versions.minor qtbase.version}/plugins"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -36,5 +38,6 @@ stdenv.mkDerivation rec {
homepage = https://flavio.tordini.org/minitube; homepage = https://flavio.tordini.org/minitube;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ ma27 ];
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -16791,7 +16791,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) vmnet; inherit (darwin.apple_sdk.frameworks) vmnet;
}; };
minitube = callPackage ../applications/video/minitube { }; minitube = libsForQt5.callPackage ../applications/video/minitube { };
mimms = callPackage ../applications/audio/mimms {}; mimms = callPackage ../applications/audio/mimms {};