From bf229fc9853b7b03cbdcc0dae9f31590f3086ed8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 28 Jul 2011 12:20:12 +0000 Subject: [PATCH] * Move Phonon out of KDE. svn path=/nixpkgs/branches/kde-4.7/; revision=27988 --- pkgs/desktops/kde-4.5/default.nix | 2 -- pkgs/desktops/kde-4.5/libs/default.nix | 4 ++-- pkgs/desktops/kde-4.7/default.nix | 4 ---- .../libraries/phonon-backend-gstreamer/default.nix} | 0 .../phonon.nix => development/libraries/phonon/default.nix} | 0 pkgs/top-level/all-packages.nix | 4 ++++ 6 files changed, 6 insertions(+), 8 deletions(-) rename pkgs/{desktops/kde-4.7/phonon-backend-gstreamer.nix => development/libraries/phonon-backend-gstreamer/default.nix} (100%) rename pkgs/{desktops/kde-4.7/phonon.nix => development/libraries/phonon/default.nix} (100%) diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index d09b4ae3f53..c152a90d2b6 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -24,8 +24,6 @@ recurseIntoAttrs rec { qt4 = qt47; - phonon = null; - kde = callPackage ./kde-package { inherit release; }; ### SUPPORT diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix index 9e9ac65c016..c45b9ac98f8 100644 --- a/pkgs/desktops/kde-4.5/libs/default.nix +++ b/pkgs/desktops/kde-4.5/libs/default.nix @@ -2,7 +2,7 @@ , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper , xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt -, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell +, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, phonon }: kde.package { @@ -19,7 +19,7 @@ kde.package { # Split plugins from libs? propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2 - shared_desktop_ontologies ]; + shared_desktop_ontologies phonon ]; patches = [ ./polkit-install.patch ]; diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index cbdd737331a..d57878388fc 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -38,10 +38,6 @@ recurseIntoAttrs rec { libkipi = callPackage ./libkipi.nix { }; - phonon = callPackage ./phonon.nix { }; - - phonon_backend_gstreamer = callPackage ./phonon-backend-gstreamer.nix { }; - #kipi_plugins = callPackage ./kipi-plugins { }; ### LIBS diff --git a/pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix similarity index 100% rename from pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix rename to pkgs/development/libraries/phonon-backend-gstreamer/default.nix diff --git a/pkgs/desktops/kde-4.7/phonon.nix b/pkgs/development/libraries/phonon/default.nix similarity index 100% rename from pkgs/desktops/kde-4.7/phonon.nix rename to pkgs/development/libraries/phonon/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bbc4daeb7c..f95935c43eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4107,6 +4107,10 @@ let pdf2xml = callPackage ../development/libraries/pdf2xml {} ; + phonon = callPackage ../development/libraries/phonon { }; + + phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { }; + phonon_backend_vlc = newScope pkgs.kde4 ../development/libraries/phonon-backend-vlc { }; physfs = callPackage ../development/libraries/physfs { };