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

libsForQt5.phonon-backend-vlc: 0.9.0 → 0.11.1

Browse Source 
Required to build with Phonon 4.11 (https://github.com/NixOS/nixpkgs/pull/71745).

Requires qttools for Qt5LinguistTools.

Qt4 support removed since Phonon no longer supports it either.

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
This commit is contained in:
Jan Tojnar 2019-11-21 21:12:55 +01:00
parent c6147f7ec8
commit c3c30bc59e
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/development/libraries/phonon/backends/vlc.nix
View File

@ -1,22 +1,13 @@
{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc { stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc
, extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null , extra-cmake-modules, qttools, qtbase, qtx11extras
, withQt4 ? false
, debug ? false , debug ? false
}: }:
with lib; with lib;
let stdenv.mkDerivation rec {
v = "0.10.2";
pname = "phonon-backend-vlc"; pname = "phonon-backend-vlc";
in version = "0.11.1";
assert withQt4 -> qt4 != null;
assert !withQt4 -> qtbase != null;
assert !withQt4 -> qtx11extras != null;
stdenv.mkDerivation {
name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://phonon.kde.org/; homepage = https://phonon.kde.org/;
@ -26,17 +17,25 @@ stdenv.mkDerivation {
}; };
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "163jqq5p9n0yfw2fqk0cqn3c6mqycxsvc4956zhkw5345g81a2a9"; sha256 = "1vp52i5996khpxs233an7mlrzdji50gcs58ig8nrwfwlgyb1xnfc";
}; };
buildInputs = buildInputs = [
[ phonon vlc ] phonon
++ (if withQt4 then [ qt4 ] else [ qtbase qtx11extras ]); vlc
qtbase
qtx11extras
];
nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt4) extra-cmake-modules; nativeBuildInputs = [
cmake
pkgconfig
qttools
extra-cmake-modules
];
cmakeFlags = cmakeFlags = [
[ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
++ optional (!withQt4) "-DPHONON_BUILD_PHONON4QT5=ON"; ];
} }

1
pkgs/top-level/aliases.nix
View File

@ -310,6 +310,7 @@ mapAliases ({
pyo3-pack = maturin; pyo3-pack = maturin;
pulseaudioLight = pulseaudio; # added 2018-04-25 pulseaudioLight = pulseaudio; # added 2018-04-25
phonon-backend-gstreamer = throw "Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon-backend-gstreamer = throw "Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22
phonon-backend-vlc = throw "Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
quake3game = ioquake3; # added 2016-01-14 quake3game = ioquake3; # added 2016-01-14
qwt6 = libsForQt5.qwt; # added 2015-12-19 qwt6 = libsForQt5.qwt; # added 2015-12-19

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

@ -13414,11 +13414,6 @@ in
phonon = callPackage ../development/libraries/phonon {}; phonon = callPackage ../development/libraries/phonon {};
# TODO(@Ma27) get rid of that as soon as QT4 can be dropped
phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {
withQt4 = true;
};
inherit (callPackage ../development/libraries/physfs { }) inherit (callPackage ../development/libraries/physfs { })
physfs_2 physfs_2
physfs; physfs;