Author: eelco
Date: Mon Jul 18 10:29:20 2011
New Revision: 27815
URL: https://svn.nixos.org/websvn/nix/?rev=27815&sc=1
Log:
* Pass Phonon as a dependency where needed.
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/baseapps.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/gwenview.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kate.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kcolorchooser.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/konsole.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/ksnapshot.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libkipi.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/okular.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/baseapps.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/baseapps.nix Mon Jul 18
09:18:38 2011 (r27814)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/baseapps.nix Mon Jul 18
10:29:20 2011 (r27815)
@@ -1,12 +1,12 @@
{ automoc4, cmake, kde, kdelibs, qt4, strigi, soprano
-, shared_desktop_ontologies, glib
+, shared_desktop_ontologies, glib, phonon
}:
kde.package {
buildInputs =
[ cmake kdelibs qt4 automoc4 strigi soprano shared_desktop_ontologies
- glib
+ glib phonon
];
meta = {
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/gwenview.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/gwenview.nix Mon Jul 18
09:18:38 2011 (r27814)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/gwenview.nix Mon Jul 18
10:29:20 2011 (r27815)
@@ -1,11 +1,12 @@
{ kde, cmake, qt4, kdelibs, automoc4, exiv2, soprano
-, shared_desktop_ontologies, kde_baseapps, libkipi }:
+, shared_desktop_ontologies, kde_baseapps, libkipi, phonon
+}:
kde.package {
buildInputs =
[ cmake qt4 kdelibs automoc4 exiv2 soprano shared_desktop_ontologies
- kde_baseapps libkipi
+ kde_baseapps libkipi phonon
];
meta = {
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kate.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kate.nix Mon Jul 18
09:18:38 2011 (r27814)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kate.nix Mon Jul 18
10:29:20 2011 (r27815)
@@ -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 {
- buildInputs = [ cmake kdelibs qt4 automoc4 shared_mime_info perl ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 shared_mime_info perl phonon ];
meta = {
description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kcolorchooser.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kcolorchooser.nix Mon Jul
18 09:18:38 2011 (r27814)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/kcolorchooser.nix Mon Jul
18 10:29:20 2011 (r27815)
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
kde.package {
- buildInputs = [ cmake kdelibs qt4 automoc4 ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
meta = {
description = "KDE color chooser utility";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/konsole.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/konsole.nix Mon Jul 18
09:18:38 2011 (r27814)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/konsole.nix Mon Jul 18
10:29:20 2011 (r27815)
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
kde.package {
- buildInputs = [ cmake kdelibs qt4 automoc4 ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
meta = {
description = "Konsole, the KDE terminal emulator";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/ksnapshot.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/ksnapshot.nix Mon Jul
18 09:18:38 2011 (r27814)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/ksnapshot.nix Mon Jul
18 10:29:20 2011 (r27815)
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4, libkipi }:
+{ automoc4, cmake, kde, kdelibs, qt4, libkipi, phonon }:
kde.package {
- buildInputs = [ cmake kdelibs qt4 automoc4 libkipi ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 libkipi phonon ];
meta = {
description = "KDE screenshot utility";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libkipi.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libkipi.nix Mon Jul 18
09:18:38 2011 (r27814)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libkipi.nix Mon Jul 18
10:29:20 2011 (r27815)
@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4 }:
+{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
kde.package {
- buildInputs = [ cmake kdelibs qt4 automoc4 ];
+ buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
meta = {
description = "Interface library to kipi-plugins";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix Mon Jul
18 09:18:38 2011 (r27814)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/libs/default.nix Mon Jul
18 10:29:20 2011 (r27815)
@@ -3,7 +3,7 @@
, xz, openexr, 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
-, getopt, udev, herqq
+, getopt, udev, herqq, phonon, gettext
}:
kde.package {
@@ -12,7 +12,7 @@
[ acl attr attica automoc4 avahi bzip2 cmake enchant fam getopt
giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre
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.
@@ -20,9 +20,6 @@
# Let kdelibs find openexr
# Split plugins from libs?
- #propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2
- # shared_desktop_ontologies ];
-
patches = [ ./polkit-install.patch ];
# cmake fails to find acl.h because of C++-style comment
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/okular.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/okular.nix Mon Jul 18
09:18:38 2011 (r27814)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/okular.nix Mon Jul 18
10:29:20 2011 (r27815)
@@ -1,11 +1,11 @@
{ automoc4, chmlib, cmake, djvulibre, ebook_tools, kde, kdelibs, libspectre
-, popplerQt4, qca2, qimageblitz, qt4 }:
+, popplerQt4, qca2, qimageblitz, qt4, phonon }:
kde.package {
buildInputs =
[ automoc4 chmlib cmake djvulibre ebook_tools kdelibs libspectre popplerQt4
- qca2 qimageblitz qt4
+ qca2 qimageblitz qt4 phonon
];
meta = {
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix Mon Jul
18 09:18:38 2011 (r27814)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix Mon Jul
18 10:29:20 2011 (r27815)
@@ -1,6 +1,7 @@
{ automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
, xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
, libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
+, phonon
}:
kde.package {
@@ -11,7 +12,7 @@
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
