BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minitube: 2.4 -> 2.9

Browse source 
Version 2.9 is based on QT5 (with a much better interface) and requires
additionally the dependencies `qtbase`, `qtdeclarative` and `qttools`.

Furthermore the `QT_PLUGIN_PATH` had to be altered, however the
`phonon-backend` contains versioned paths, so we provide the plugin path
that matches the QT version used to build this package.

See #33248
This commit is contained in:
Maximilian Bosch 2018-05-04 16:06:47 +02:00
parent ef01f17c2d
commit 39c63320cb
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
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
# account. You'll need to generate (and please share :-) a new one if it breaks.
, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
stdenv.mkDerivation rec {
name = "minitube-${version}";
version = "2.4";
version = "2.9";
src = fetchFromGitHub {
sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5";
sha256 = "11zkmwqadlgrrghs3rxq0h0fllfnyd3g09d7gdd6vd9r1a1yz73f";
rev = version;
repo = "minitube";
owner = "flaviotordini";
};
buildInputs = [ phonon phonon-backend-vlc qt4 ];
nativeBuildInputs = [ makeWrapper qmake4Hook ];
buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools ];
nativeBuildInputs = [ makeWrapper qmake ];
qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
postInstall = ''
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; {
@ -36,5 +38,6 @@ stdenv.mkDerivation rec {
homepage = https://flavio.tordini.org/minitube;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ma27 ];
};
}

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

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