diff --git a/pkgs/applications/misc/k3b/1.0.nix b/pkgs/applications/misc/k3b/1.0.nix new file mode 100644 index 000000000000..7ac483cedea7 --- /dev/null +++ b/pkgs/applications/misc/k3b/1.0.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3}: + +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"; + + meta = { + description = "A CD and DVD authoring application for KDE"; + homepage = http://www.k3b.org/; + }; +} diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index 9f6f4d14c111..756adb03f75d 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b7229592037..3d234ca43ad4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5817,6 +5817,8 @@ let 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 @@ let inherit (kde3) kdelibs; }; - k3b = callPackage ../applications/misc/k3b { + k3b1 = callPackage ../applications/misc/k3b/1.0.nix { inherit (kde3) kdelibs; };