Author: urkud
Date: Mon Oct 18 09:48:32 2010
New Revision: 24338
URL: https://svn.nixos.org/websvn/nix/?rev=24338&sc=1
Log:
Advance k3b version to 2.0.1.
Submitted by Karn Kallio
Added:
nixpkgs/trunk/pkgs/applications/misc/k3b/1.0.nix
- copied, changed from r24337,
nixpkgs/trunk/pkgs/applications/misc/k3b/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/misc/k3b/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/applications/misc/k3b/1.0.nix (from
r24337, nixpkgs/trunk/pkgs/applications/misc/k3b/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/k3b/default.nix Mon Oct 18
09:43:17 2010 (r24337, copy source)
+++ nixpkgs/trunk/pkgs/applications/misc/k3b/1.0.nix Mon Oct 18 09:48:32
2010 (r24338)
@@ -2,12 +2,12 @@
stdenv.mkDerivation {
name = "k3b-1.0.5";
-
+
src = fetchurl {
url = mirror://sourceforge/k3b/k3b-1.0.5.tar.bz2;
sha256 = "1pshv8na1sr9xcmkr0byjgyl8jmxwcylkl8pwjvripja4fgpkyfl";
};
-
+
buildInputs = [kdelibs x11 zlib libpng libjpeg perl qt3];
configureFlags = "--without-arts";
Modified: nixpkgs/trunk/pkgs/applications/misc/k3b/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/k3b/default.nix Mon Oct 18
09:43:17 2010 (r24337)
+++ nixpkgs/trunk/pkgs/applications/misc/k3b/default.nix Mon Oct 18
09:48:32 2010 (r24338)
@@ -1,19 +1,29 @@
-{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3}:
+{ stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
+, ffmpeg, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
+, kdelibs, kdemultimedia, cdrdao, cdrtools, dvdplusrwtools
+, automoc4, phonon, makeWrapper
+}:
-stdenv.mkDerivation {
- name = "k3b-1.0.5";
-
+stdenv.mkDerivation rec {
+ name = "k3b-2.0.1";
src = fetchurl {
- url = mirror://sourceforge/k3b/k3b-1.0.5.tar.bz2;
- sha256 = "1pshv8na1sr9xcmkr0byjgyl8jmxwcylkl8pwjvripja4fgpkyfl";
+ url = "mirror://sourceforge/k3b/${name}.tar.bz2";
+ sha256 = "1dyd3i2hqd5xs9rz4f8k74zca91j9sp72lhl0zws2cvqc474ccc6";
};
-
- buildInputs = [kdelibs x11 zlib libpng libjpeg perl qt3];
- configureFlags = "--without-arts";
+ buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib
+ ffmpeg flac libsamplerate libdvdread lame libsndfile
+ libmad gettext stdenv.gcc.libc cdrdao cdrtools
+ kdelibs kdemultimedia automoc4 phonon dvdplusrwtools
+ makeWrapper ];
- meta = {
- description = "A CD and DVD authoring application for KDE";
- homepage = http://www.k3b.org/;
+ postInstall = ''
+ wrapProgram $out/bin/k3b --suffix PATH :
"${cdrdao}/bin:${dvdplusrwtools}/bin:${cdrtools}/bin"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "CD/DVD Burning Application for KDE";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.sander maintainers.urkud ];
};
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Oct 18 09:43:17
2010 (r24337)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Oct 18 09:48:32
2010 (r24338)
@@ -5817,6 +5817,8 @@
jwm = callPackage ../applications/window-managers/jwm { };
+ k3b = newScope pkgs.kde4 ../applications/misc/k3b { };
+
kadu = newScope pkgs.kde45
../applications/networking/instant-messengers/kadu { };
kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
@@ -6676,7 +6678,7 @@
inherit (kde3) kdelibs;
};
- k3b = callPackage ../applications/misc/k3b {
+ k3b1 = callPackage ../applications/misc/k3b/1.0.nix {
inherit (kde3) kdelibs;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
