public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

k3b: propagate cdrecord dependency 

By default, k3b will use cdrkit, but that can be overriden by choosing
the original cdrtools.
This commit is contained in:
Thomas Tuegel 2015-01-30 07:56:47 -06:00
parent 76c396848d
commit 95829c8959
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/k3b/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, cmake, qt4, perl, shared_mime_info, libvorbis, taglib { stdenv, fetchurl, makeWrapper, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext , flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
, transcode, cdrdao, dvdplusrwtools, vcdimager, cdparanoia , transcode, cdrdao, cdrtools, dvdplusrwtools, vcdimager, cdparanoia
, kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null , kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null
}: }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
# at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format, # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format,
# eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild, # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild,
# vcdxminfo, and vcdxrip # vcdxminfo, and vcdxrip
propagatedUserEnvPkgs = [ transcode dvdplusrwtools cdrdao vcdimager ]; propagatedUserEnvPkgs = [ cdrdao cdrtools dvdplusrwtools transcode vcdimager ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/k3b \ wrapProgram $out/bin/k3b \

4
pkgs/top-level/all-packages.nix
View File

@ -12366,7 +12366,9 @@ let
eventlist = callPackage ../applications/office/eventlist {}; eventlist = callPackage ../applications/office/eventlist {};
k3b = callPackage ../applications/misc/k3b { }; k3b = callPackage ../applications/misc/k3b {
cdrtools = cdrkit;
};
kadu = callPackage ../applications/networking/instant-messengers/kadu { }; kadu = callPackage ../applications/networking/instant-messengers/kadu { };