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

* Pass Phonon as a dependency where needed.

Browse Source 
svn path=/nixpkgs/branches/kde-4.7/; revision=27815
This commit is contained in:
Eelco Dolstra 2011-07-18 10:29:20 +00:00
parent c416926580
commit 3c668adea1
10 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,12 @@
{ automoc4, cmake, kde, kdelibs, qt4, strigi, soprano { automoc4, cmake, kde, kdelibs, qt4, strigi, soprano
, shared_desktop_ontologies, glib , shared_desktop_ontologies, glib, phonon
}: }:
kde.package { kde.package {
buildInputs = buildInputs =
[ cmake kdelibs qt4 automoc4 strigi soprano shared_desktop_ontologies [ cmake kdelibs qt4 automoc4 strigi soprano shared_desktop_ontologies
glib glib phonon
]; ];
meta = { meta = {

5
pkgs/desktops/kde-4.7/gwenview.nix
View File

@ -1,11 +1,12 @@
{ kde, cmake, qt4, kdelibs, automoc4, exiv2, soprano { kde, cmake, qt4, kdelibs, automoc4, exiv2, soprano
, shared_desktop_ontologies, kde_baseapps, libkipi }: , shared_desktop_ontologies, kde_baseapps, libkipi, phonon
}:
kde.package { kde.package {
buildInputs = buildInputs =
[ cmake qt4 kdelibs automoc4 exiv2 soprano shared_desktop_ontologies [ cmake qt4 kdelibs automoc4 exiv2 soprano shared_desktop_ontologies
kde_baseapps libkipi kde_baseapps libkipi phonon
]; ];
meta = { meta = {

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

@ -1,8 +1,8 @@
{ automoc4, cmake, kde, kdelibs, qt4, shared_mime_info, perl }: { automoc4, cmake, kde, kdelibs, qt4, shared_mime_info, perl, phonon }:
kde.package { kde.package {
buildInputs = [ cmake kdelibs qt4 automoc4 shared_mime_info perl ]; buildInputs = [ cmake kdelibs qt4 automoc4 shared_mime_info perl phonon ];
meta = { meta = {
description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; description = "Kate, the KDE Advanced Text Editor, as well as KWrite";

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

@ -1,8 +1,8 @@
{ automoc4, cmake, kde, kdelibs, qt4 }: { automoc4, cmake, kde, kdelibs, qt4, phonon }:
kde.package { kde.package {
buildInputs = [ cmake kdelibs qt4 automoc4 ]; buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
meta = { meta = {
description = "KDE color chooser utility"; description = "KDE color chooser utility";

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

@ -1,8 +1,8 @@
{ automoc4, cmake, kde, kdelibs, qt4 }: { automoc4, cmake, kde, kdelibs, qt4, phonon }:
kde.package { kde.package {
buildInputs = [ cmake kdelibs qt4 automoc4 ]; buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
meta = { meta = {
description = "Konsole, the KDE terminal emulator"; description = "Konsole, the KDE terminal emulator";

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

@ -1,8 +1,8 @@
{ automoc4, cmake, kde, kdelibs, qt4, libkipi }: { automoc4, cmake, kde, kdelibs, qt4, libkipi, phonon }:
kde.package { kde.package {
buildInputs = [ cmake kdelibs qt4 automoc4 libkipi ]; buildInputs = [ cmake kdelibs qt4 automoc4 libkipi phonon ];
meta = { meta = {
description = "KDE screenshot utility"; description = "KDE screenshot utility";

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

@ -1,8 +1,8 @@
{ automoc4, cmake, kde, kdelibs, qt4 }: { automoc4, cmake, kde, kdelibs, qt4, phonon }:
kde.package { kde.package {
buildInputs = [ cmake kdelibs qt4 automoc4 ]; buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
meta = { meta = {
description = "Interface library to kipi-plugins"; description = "Interface library to kipi-plugins";

7
pkgs/desktops/kde-4.7/libs/default.nix
View File

@ -3,7 +3,7 @@
, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , xz, openexr, 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 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
, getopt, udev, herqq , getopt, udev, herqq, phonon, gettext
}: }:
kde.package { kde.package {
@ -12,7 +12,7 @@ kde.package {
[ acl attr attica automoc4 avahi bzip2 cmake enchant fam getopt [ acl attr attica automoc4 avahi bzip2 cmake enchant fam getopt
giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre
perl perl polkit_qt_1 qca2 qt4 shared_desktop_ontologies perl perl polkit_qt_1 qca2 qt4 shared_desktop_ontologies
shared_mime_info soprano strigi udev xz shared_mime_info soprano strigi udev xz phonon libxml2
]; ];
# TODO: make sonnet plugins (dictionaries) really work. # TODO: make sonnet plugins (dictionaries) really work.
@ -20,9 +20,6 @@ kde.package {
# Let kdelibs find openexr # Let kdelibs find openexr
# Split plugins from libs? # Split plugins from libs?
#propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
# shared_desktop_ontologies ];
patches = [ ./polkit-install.patch ]; patches = [ ./polkit-install.patch ];
# cmake fails to find acl.h because of C++-style comment # cmake fails to find acl.h because of C++-style comment

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

@ -1,11 +1,11 @@
{ automoc4, chmlib, cmake, djvulibre, ebook_tools, kde, kdelibs, libspectre { automoc4, chmlib, cmake, djvulibre, ebook_tools, kde, kdelibs, libspectre
, popplerQt4, qca2, qimageblitz, qt4 }: , popplerQt4, qca2, qimageblitz, qt4, phonon }:
kde.package { kde.package {
buildInputs = buildInputs =
[ automoc4 chmlib cmake djvulibre ebook_tools kdelibs libspectre popplerQt4 [ automoc4 chmlib cmake djvulibre ebook_tools kdelibs libspectre popplerQt4
qca2 qimageblitz qt4 qca2 qimageblitz qt4 phonon
]; ];
meta = { meta = {

3
pkgs/desktops/kde-4.7/workspace.nix
View File

@ -1,6 +1,7 @@
{ automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt { automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
, xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394 , xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
, libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit , libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
, phonon
}: }:
kde.package { kde.package {
@ -11,7 +12,7 @@ kde.package {
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs xorg.libpthreadstubs
soprano shared_desktop_ontologies lm_sensors pciutils libraw1394 soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
libusb python libqalculate akonadi perl consolekit libusb python libqalculate akonadi perl consolekit phonon
]; ];
# Workaround for undefined reference to ‘dlsym’ in # Workaround for undefined reference to ‘dlsym’ in