k3b: 2.0.3a -> 17.04.0

4 files changed, 43 insertions, 50 deletions

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index a77d3d0b3472..81c50147cb68 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -59,6 +59,7 @@ let
       ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
       filelight = callPackage ./filelight.nix {};
       gwenview = callPackage ./gwenview.nix {};
+      k3b = callPackage ./k3b.nix {};
       kate = callPackage ./kate.nix {};
       kdenlive = callPackage ./kdenlive.nix {};
       kcalc = callPackage ./kcalc.nix {};
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
new file mode 100644
index 000000000000..d1cd33a52089
--- /dev/null
+++ b/pkgs/applications/kde/k3b.nix
@@ -0,0 +1,41 @@
+{ kdeApp, lib, kdeWrapper, extra-cmake-modules
+, qtwebkit
+, libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
+, flac, lame, libmad, libmpcdec, libvorbis
+, libsamplerate, libsndfile, taglib
+, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
+, ffmpeg, libmusicbrainz2, normalize, sox, transcode
+}:
+
+let
+  unwrapped =
+    kdeApp {
+      name = "k3b";
+      meta = with lib; {
+        license = with licenses; [ gpl2Plus ];
+        maintainers = with maintainers; [ sander phreedom ];
+        platforms = platforms.linux;
+      };
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+      propagatedBuildInputs = [
+        # qt
+        qtwebkit
+        # kde
+        libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
+        # formats
+        flac lame libmad libmpcdec libvorbis
+        # sound utilities
+        libsamplerate libsndfile taglib
+        # cd/dvd
+        cdparanoia libdvdcss libdvdread
+        # others
+        ffmpeg libmusicbrainz2
+      ];
+      enableParallelBuilding = true;
+    };
+
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/k3b" ];
+  paths = [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode vcdimager ];
+}
diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
deleted file mode 100644
index 072685b81944..000000000000
--- a/pkgs/applications/misc/k3b/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig
-, shared_mime_info, libvorbis, taglib, flac, libsamplerate
-, libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao
-, dvdplusrwtools, vcdimager, cdparanoia, kdelibs4, libdvdcss, ffmpeg
-, libkcddb, phonon
-}:
-
-let
-  # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format,
-  # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild,
-  # vcdxminfo, and vcdxrip
-  binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager ];
-
-in stdenv.mkDerivation rec {
-  name = "k3b-${version}";
-  version = "2.0.3a";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/k3b/${name}.tar.xz";
-    sha256 = "10f07465g9860chfnvrp9w3m686g6j9f446xgnnx7h82d1sb42rd";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  buildInputs = [
-    shared_mime_info libvorbis taglib flac libsamplerate libdvdread
-    lame libsndfile libmad stdenv.cc.libc kdelibs4
-    phonon libkcddb makeWrapper cdparanoia
-    libdvdcss ffmpeg
-  ];
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_LINK = [ "-lcdda_interface" "-lcdda_paranoia" "-ldvdcss" ];
-
-  postInstall = ''
-    wrapProgram $out/bin/k3b \
-      --prefix PATH ":" "${binPath}"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "CD/DVD Burning Application for KDE";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.sander maintainers.phreedom ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 121204c95f60..dc617986c674 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14462,9 +14462,7 @@ with pkgs;
     boost = boost155;
   };
 
-  k3b-original = lowPrio (kde4.callPackage ../applications/misc/k3b { });
-
-  k3b = kde4.callPackage ../applications/misc/k3b/wrapper.nix { };
+  k3b = kdeApplications.k3b;
 
   k9copy = libsForQt5.callPackage ../applications/video/k9copy {};