diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-01-30 07:56:47 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-02-01 10:34:30 -0600 |
| commit | 95829c895998a5d365d91e975e47699abd924e33 (patch) | |
| tree | aae9b3c45299059ea0af895728d958e49a9332c3 /pkgs | |
| parent | 76c396848d471f7958adc1b3ef832d4502f4b68b (diff) | |
| download | nixpkgs-95829c895998a5d365d91e975e47699abd924e33.tar nixpkgs-95829c895998a5d365d91e975e47699abd924e33.tar.gz nixpkgs-95829c895998a5d365d91e975e47699abd924e33.tar.bz2 nixpkgs-95829c895998a5d365d91e975e47699abd924e33.tar.lz nixpkgs-95829c895998a5d365d91e975e47699abd924e33.tar.xz nixpkgs-95829c895998a5d365d91e975e47699abd924e33.tar.zst nixpkgs-95829c895998a5d365d91e975e47699abd924e33.zip | |
k3b: propagate cdrecord dependency
By default, k3b will use cdrkit, but that can be overriden by choosing the original cdrtools.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/k3b/default.nix | 4 | ||||
| -rw-r--r-- | 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 { }; |