diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index 5067a3bd2c25..844c2e580093 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -1,39 +1,28 @@ -{ stdenv, fetchurl, cmake, automoc4, pkgconfig, gst_all_1 -, phonon, qt4 ? null, qt5 ? null, withQt5 ? false }: - -with stdenv.lib; - -assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); +{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gstreamer +, gst_plugins_base }: let - version = "4.8.0"; + version = "4.7.2"; pname = "phonon-backend-gstreamer"; - qt = if withQt5 then qt5 else qt4; - # Force same Qt version in phonon - phonon_ = phonon.override { inherit qt4 qt5 withQt5; }; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/${name}.tar.xz"; - sha256 = "0zjqf1gpj6h9hj27225vihg5gj0fjgvh4n9nkrbij7kf57bcn6gq"; + url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "1cfjk450aajr8hfhnfq7zbmryprxiwr9ha5x585dsh7mja82mdw0"; }; - buildInputs = with gst_all_1; [ phonon_ qt gstreamer gst-plugins-base ]; + buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - cmakeFlags = - [ "-DCMAKE_INSTALL_LIBDIR=lib" - ] ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = { homepage = http://phonon.kde.org/; description = "GStreamer backend for Phonon"; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel ]; - license = licenses.lgpl21Plus; - }; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2749b76816cb..cb1661c17ab1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6610,13 +6610,7 @@ let qt4 = null; }; - phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { inherit qt4; }; - - phonon_qt5_backend_gstreamer = phonon_backend_gstreamer.override { - withQt5 = true; - inherit qt5; - qt4 = null; - }; + phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { }; phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { inherit qt4; };