Patch to advance the version of K3B to 2.0.1 .
The new Nix expression is not "bundled" with the KDE expressions, as was k3b
2.0.0 "bundled" with kde-4.4. Also the old 1.0.x series of k3b is kept.
From 53b56072c20bf4ff0e403cede89c493252818910 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkal...@eka.(none)>
Date: Mon, 18 Oct 2010 01:15:00 -0430
Subject: [PATCH] Advance k3b version to 2.0.1.
---
pkgs/applications/misc/k3b/1.0.nix | 19 +++++++++++++++++++
pkgs/applications/misc/k3b/default.nix | 30 ++++++++++++++++++++----------
pkgs/top-level/all-packages.nix | 4 +++-
3 files changed, 42 insertions(+), 11 deletions(-)
create mode 100644 pkgs/applications/misc/k3b/1.0.nix
diff --git a/pkgs/applications/misc/k3b/1.0.nix b/pkgs/applications/misc/k3b/1.0.nix
new file mode 100644
index 0000000..9f6f4d1
--- /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 9f6f4d1..cdf2110 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";
-
+ name = "k3b-2.0.1";
src = fetchurl {
- url = mirror://sourceforge/k3b/k3b-1.0.5.tar.bz2;
- sha256 = "1pshv8na1sr9xcmkr0byjgyl8jmxwcylkl8pwjvripja4fgpkyfl";
+ url = mirror://sourceforge/k3b/k3b-2.0.1.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 ];
+ postInstall = ''
+ wrapProgram $out/bin/k3b --suffix PATH : "${cdrdao}/bin:${dvdplusrwtools}/bin:${cdrtools}/bin"
+ '';
+
meta = {
- description = "A CD and DVD authoring application for KDE";
- homepage = http://www.k3b.org/;
+ description = "CD/DVD Burning Application for KDE";
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [ stdenv.lib.maintainers.sander ];
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef0ef67..b9fb823 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5811,6 +5811,8 @@ let
jwm = callPackage ../applications/window-managers/jwm { };
+ k3b2 = newScope pkgs.kde4 ../applications/misc/k3b { };
+
kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { };
kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
@@ -6670,7 +6672,7 @@ let
inherit (kde3) kdelibs;
};
- k3b = callPackage ../applications/misc/k3b {
+ k3b = callPackage ../applications/misc/k3b/1.0.nix {
inherit (kde3) kdelibs;
};
--
1.7.3.1
_______________________________________________
nix-dev mailing list
[email protected]
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
