diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-21 21:08:05 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-22 20:24:43 +0100 |
commit | c6147f7ec8895f7dbeea4142d9d7b4082f628ea5 (patch) | |
tree | 80a6051c1b7f2e5de2241e8349f3169db92b9437 | |
parent | 77661f8cfde49992338daf7d0bdd35eb93d65624 (diff) |
libsForQt5.phonon-backend-gstreamer: 4.9.0 → 4.10.0
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 <worldofpeace@protonmail.ch>
-rw-r--r-- | pkgs/development/libraries/phonon/backends/gstreamer.nix | 41 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 23 insertions, 25 deletions
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"}" + ]; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 815d0ee9ae895..0424b6e289585 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -309,6 +309,7 @@ mapAliases ({ procps-ng = procps; # added 2018-06-08 pyo3-pack = maturin; 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 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 quake3game = ioquake3; # added 2016-01-14 qwt6 = libsForQt5.qwt; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81c24b524f3a5..e26fe3bea3604 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13414,8 +13414,6 @@ in phonon = callPackage ../development/libraries/phonon {}; - phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; - # 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; @@ -13709,9 +13707,7 @@ in withQt5 = true; }; - phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { - withQt5 = true; - }; + phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; |