public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Move Phonon out of KDE.

Browse Source 
svn path=/nixpkgs/branches/kde-4.7/; revision=27988
This commit is contained in:
Eelco Dolstra 2011-07-28 12:20:12 +00:00
parent 6c4f6ceb4f
commit bf229fc985
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-4.5/default.nix
View File

@ -24,8 +24,6 @@ recurseIntoAttrs rec {
qt4 = qt47; qt4 = qt47;
phonon = null;
kde = callPackage ./kde-package { inherit release; }; kde = callPackage ./kde-package { inherit release; };
### SUPPORT ### SUPPORT

4
pkgs/desktops/kde-4.5/libs/default.nix
View File

@ -2,7 +2,7 @@
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt , 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 { kde.package {
@ -19,7 +19,7 @@ kde.package {
# Split plugins from libs? # Split plugins from libs?
propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2 propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
shared_desktop_ontologies ]; shared_desktop_ontologies phonon ];
patches = [ ./polkit-install.patch ]; patches = [ ./polkit-install.patch ];

4
pkgs/desktops/kde-4.7/default.nix
View File

@ -38,10 +38,6 @@ recurseIntoAttrs rec {
libkipi = callPackage ./libkipi.nix { }; libkipi = callPackage ./libkipi.nix { };
phonon = callPackage ./phonon.nix { };
phonon_backend_gstreamer = callPackage ./phonon-backend-gstreamer.nix { };
#kipi_plugins = callPackage ./kipi-plugins { }; #kipi_plugins = callPackage ./kipi-plugins { };
### LIBS ### LIBS

0
pkgs/desktops/kde-4.7/phonon-backend-gstreamer.nix → pkgs/development/libraries/phonon-backend-gstreamer/default.nix
View File

0
pkgs/desktops/kde-4.7/phonon.nix → pkgs/development/libraries/phonon/default.nix
View File

4
pkgs/top-level/all-packages.nix
View File

@ -4107,6 +4107,10 @@ let
pdf2xml = callPackage ../development/libraries/pdf2xml {} ; 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 { }; phonon_backend_vlc = newScope pkgs.kde4 ../development/libraries/phonon-backend-vlc { };
physfs = callPackage ../development/libraries/physfs { }; physfs = callPackage ../development/libraries/physfs { };