NixOS · May 11, 2017 · May 11, 2017
Showing with 62 additions and 50 deletions.

+2 −0 pkgs/applications/kde/default.nix

+41 −0 pkgs/applications/kde/k3b.nix

+18 −0 pkgs/applications/kde/libkcddb.nix

+0 −47 pkgs/applications/misc/k3b/default.nix

+1 −3 pkgs/top-level/all-packages.nix
diff --git 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 {};
@@ -80,6 +81,7 @@ let
       konsole = callPackage ./konsole.nix {};
       krfb = callPackage ./krfb.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
+      libkcddb = callPackage ./libkcddb.nix {};
       libkdcraw = callPackage ./libkdcraw.nix {};
       libkexiv2 = callPackage ./libkexiv2.nix {};
       libkipi = callPackage ./libkipi.nix {};

diff --git a/pkgs/applications/kde/k3b.nix 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/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix
@@ -0,0 +1,18 @@
+{ kdeApp, lib, extra-cmake-modules, qtbase, kdoctools
+, kcodecs, ki18n, kio, kwidgetsaddons
+, libmusicbrainz5 }:
+
+kdeApp {
+  name = "libkcddb";
+  meta = with lib; {
+    license = with licenses; [ gpl2 lgpl21 bsd3 ];
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase kdoctools ];
+  propagatedBuildInputs = [
+    kcodecs ki18n kio kwidgetsaddons
+    libmusicbrainz5
+  ];
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
diff --git 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 {};