From c6147f7ec8895f7dbeea4142d9d7b4082f628ea5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 21 Nov 2019 21:08:05 +0100 Subject: libsForQt5.phonon-backend-gstreamer: 4.9.0 → 4.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Required to build with Phonon 4.11 (https://github.com/NixOS/nixpkgs/pull/71745). Not having this blocks the channels. Requires qttools for Qt5LinguistTools. Qt4 support removed since Phonon no longer supports it either. Co-authored-by: worldofpeace --- .../libraries/phonon/backends/gstreamer.nix | 41 +++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'pkgs/development/libraries/phonon') diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index ef7633dadaf36..d9267827e779a 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -1,21 +1,13 @@ { stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig -, extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null -, withQt5 ? false +, extra-cmake-modules, qttools, qtbase, qtx11extras , debug ? false }: with lib; -let - v = "4.9.0"; +stdenv.mkDerivation rec { pname = "phonon-backend-gstreamer"; -in - -assert withQt5 -> qtbase != null; -assert withQt5 -> qtx11extras != null; - -stdenv.mkDerivation { - name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; + version = "4.10.0"; meta = with stdenv.lib; { homepage = https://phonon.kde.org/; @@ -26,8 +18,8 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; - sha256 = "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf"; + url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5"; }; # Hardcode paths to useful plugins so the backend doesn't depend @@ -52,17 +44,26 @@ stdenv.mkDerivation { ''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"'' ]; - buildInputs = with gst_all_1; - [ gstreamer gst-plugins-base phonon ] - ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]); + buildInputs = with gst_all_1; [ + gstreamer + gst-plugins-base + phonon + qtbase + qtx11extras + ]; # cleanup: the build system creates (empty) $out/$out/share/icons (double prefix) # if DESTDIR is unset DESTDIR="/"; - nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + nativeBuildInputs = [ + cmake + pkgconfig + extra-cmake-modules + qttools + ]; - cmakeFlags = - [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] - ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" + ]; } -- cgit 1.4.1