Skip to content

Commit

Permalink
libsForQt5.phonon-backend-gstreamer: 4.9.0 → 4.10.0
Browse files Browse the repository at this point in the history
Required to build with Phonon 4.11 (NixOS#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>
  • Loading branch information
jtojnar and worldofpeace committed Nov 22, 2019
1 parent 77661f8 commit c6147f7
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 25 deletions.
41 changes: 21 additions & 20 deletions 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/;
Expand All @@ -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
Expand All @@ -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"}"
];
}
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -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;
Expand Down Expand Up @@ -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 { };

Expand Down

0 comments on commit c6147f7

Please sign in to comment.