From 9a91200e9e6bc6592a6b086f635593cc409e0853 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@gmail.com> Date: Sat, 19 Dec 2015 20:08:22 -0600 Subject: [PATCH] phonon: Qt 5 infrastructure update --- pkgs/development/libraries/phonon/qt5/old.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/development/libraries/phonon/qt5/old.nix diff --git a/pkgs/development/libraries/phonon/qt5/old.nix b/pkgs/development/libraries/phonon/qt5/old.nix deleted file mode 100644 index 3dddd60b59f8..000000000000 --- a/pkgs/development/libraries/phonon/qt5/old.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio, qt5, debug ? false }: - -with stdenv.lib; - -let - v = "4.8.3"; -in - -stdenv.mkDerivation rec { - name = "phonon-${v}"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz"; - sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; - }; - - buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools libpulseaudio ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - NIX_CFLAGS_COMPILE = "-fPIC"; - - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" - "-DPHONON_BUILD_PHONON4QT5=ON" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - meta = { - homepage = http://phonon.kde.org/; - description = "Multimedia API for Qt"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37da25438c8d..358c0d14699a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8032,8 +8032,6 @@ let phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {}; - phonon_qt5 = callPackage ../development/libraries/phonon/qt5/old.nix {}; - physfs = callPackage ../development/libraries/physfs { }; pipelight = callPackage ../tools/misc/pipelight { @@ -15803,6 +15801,7 @@ aliases = with self; rec { lttngUst = lttng-ust; # added 2014-07-31 mlt-qt5 = qt5.mlt; # added 2015-12-19 nfsUtils = nfs-utils; # added 2014-12-06 + phonon_qt5 = qt5.phonon; # added 2015-12-19 phonon_qt5_backend_gstreamer = qt5.phonon_backend_gstreamer; # added 2015-12-19 qca-qt5 = qt5.qca-qt5; # added 2015-12-19 quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30