From 95829c895998a5d365d91e975e47699abd924e33 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 30 Jan 2015 07:56:47 -0600
Subject: [PATCH] k3b: propagate cdrecord dependency

By default, k3b will use cdrkit, but that can be overriden by choosing
the original cdrtools.
---
 pkgs/applications/misc/k3b/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix        | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index e551b12608e..7730402a795 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
 , flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
-, transcode, cdrdao, dvdplusrwtools, vcdimager, cdparanoia
+, transcode, cdrdao, cdrtools, dvdplusrwtools, vcdimager, cdparanoia
 , kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format,
   # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild,
   # vcdxminfo, and vcdxrip
-  propagatedUserEnvPkgs = [ transcode dvdplusrwtools cdrdao vcdimager ];
+  propagatedUserEnvPkgs = [ cdrdao cdrtools dvdplusrwtools transcode vcdimager ];
 
   postInstall = ''
     wrapProgram $out/bin/k3b \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5ab4e69e17..0051c52269e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12366,7 +12366,9 @@ let
 
       eventlist = callPackage ../applications/office/eventlist {};
 
-      k3b = callPackage ../applications/misc/k3b { };
+      k3b = callPackage ../applications/misc/k3b {
+        cdrtools = cdrkit;
+      };
 
       kadu = callPackage ../applications/networking/instant-messengers/kadu { };