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

Merge branch 'master' of github.com:NixOS/nixpkgs

This commit is contained in:
Shea Levy 2017-06-27 15:35:47 -04:00
parent 551dcb6783 67e4072282
commit 711637a4a7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/kde/k3b.nix
View File

@ -1,11 +1,11 @@
{ mkDerivation, lib { mkDerivation, lib
, extra-cmake-modules, kdoctools, makeWrapper , extra-cmake-modules, kdoctools, makeWrapper
, qtwebkit , qtwebkit
, libkcddb, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
, flac, lame, libmad, libmpcdec, libvorbis , flac, lame, libmad, libmpcdec, libvorbis
, libsamplerate, libsndfile, taglib , libsamplerate, libsndfile, taglib
, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
, ffmpeg, libmusicbrainz2, normalize, sox, transcode , ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info
}: }:
mkDerivation { mkDerivation {
@ -20,7 +20,7 @@ mkDerivation {
# qt # qt
qtwebkit qtwebkit
# kde # kde
libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
# formats # formats
flac lame libmad libmpcdec libvorbis flac lame libmad libmpcdec libvorbis
# sound utilities # sound utilities
@ -28,7 +28,7 @@ mkDerivation {
# cd/dvd # cd/dvd
cdparanoia libdvdcss libdvdread cdparanoia libdvdcss libdvdread
# others # others
ffmpeg libmusicbrainz2 ffmpeg libmusicbrainz2 shared_mime_info
]; ];
postFixup = postFixup =
let k3bPath = lib.makeBinPath [ let k3bPath = lib.makeBinPath [