Author: eelco
Date: Mon Jul 25 20:17:36 2011
New Revision: 27953
URL: https://svn.nixos.org/websvn/nix/?rev=27953&sc=1
Log:
* Updated kdemultimedia.
Added:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/multimedia.nix
- copied, changed from r27866,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/multimedia/default.nix
Deleted:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/multimedia/
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Mon Jul 25
20:10:45 2011 (r27952)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Mon Jul 25
20:17:36 2011 (r27953)
@@ -86,6 +86,8 @@
kdeadmin = callPackage ./admin.nix { };
kdegames = callPackage ./games.nix { };
+
+ kdemultimedia = callPackage ./multimedia.nix { };
/*
kdeaccessibility = combinePkgs "kdeaccessibility" {
@@ -116,7 +118,6 @@
kdeedu = callPackage ./edu { };
kdegames = callPackage ./games { };
kdegraphics = callPackage ./graphics { };
- kdemultimedia = callPackage ./multimedia { };
kdenetwork = callPackage ./network { };
kdeplasma_addons = callPackage ./plasma-addons { };
Copied and modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/multimedia.nix (from r27866,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/multimedia/default.nix)
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/multimedia/default.nix
Thu Jul 21 07:42:05 2011 (r27866, copy source)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/multimedia.nix Mon Jul
25 20:17:36 2011 (r27953)
@@ -1,16 +1,17 @@
-{ kde, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac,
-cdparanoia, lame , kdelibs, automoc4, ffmpeg, libmusicbrainz2, libtunepimp }:
+{ kde, cmake, perl, qt4, phonon, alsaLib, libvorbis, taglib, flac
+, cdparanoia, lame, kdelibs, automoc4, ffmpeg, libmusicbrainz3, libtunepimp }:
kde.package {
- buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib
- cdparanoia lame kdelibs automoc4 ffmpeg libmusicbrainz2 libtunepimp ];
+ buildInputs =
+ # Note: kdemultimedia can use xine-lib, but it doesn't seem useful
+ # without the Phonon Xine backend.
+ [ cmake kdelibs qt4 automoc4 phonon cdparanoia taglib libvorbis
+ libmusicbrainz3 libtunepimp ffmpeg flac lame
+ ];
meta = {
- description = "KDE Multimedia";
- longDescription = ''
- Contains various Multimedia utilties for KDE such as a movie player and
sound volume mixer.
- '';
+ description = "KDE multimedia programs such as a movie player and volume
utility";
license = "GPL";
kde.name = "kdemultimedia";
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
