about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2017-06-27 15:35:47 -0400
committerShea Levy <shea@shealevy.com>2017-06-27 15:35:47 -0400
commit711637a4a7b43c0b192ed58784a745b815383471 (patch)
treee69aceb91327bd6f6c4fd24410d90ae3c103231b /pkgs
parent551dcb67831e480b15be2d54c96d84645a637820 (diff)
parent67e40722824834b9557c6b8f390aa4a6ea98e805 (diff)
downloadnixlib-711637a4a7b43c0b192ed58784a745b815383471.tar
nixlib-711637a4a7b43c0b192ed58784a745b815383471.tar.gz
nixlib-711637a4a7b43c0b192ed58784a745b815383471.tar.bz2
nixlib-711637a4a7b43c0b192ed58784a745b815383471.tar.lz
nixlib-711637a4a7b43c0b192ed58784a745b815383471.tar.xz
nixlib-711637a4a7b43c0b192ed58784a745b815383471.tar.zst
nixlib-711637a4a7b43c0b192ed58784a745b815383471.zip
Merge branch 'master' of github.com:NixOS/nixpkgs
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/kde/k3b.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index e1f1132a08f3..79806dc93fbc 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,11 +1,11 @@
 { mkDerivation, lib
 , extra-cmake-modules, kdoctools, makeWrapper
 , qtwebkit
-, libkcddb, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
+, libkcddb, karchive, kcmutils, 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
+, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info
 }:
 
 mkDerivation {
@@ -20,7 +20,7 @@ mkDerivation {
     # qt
     qtwebkit
     # kde
-    libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
+    libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
     # formats
     flac lame libmad libmpcdec libvorbis
     # sound utilities
@@ -28,7 +28,7 @@ mkDerivation {
     # cd/dvd
     cdparanoia libdvdcss libdvdread
     # others
-    ffmpeg libmusicbrainz2
+    ffmpeg libmusicbrainz2 shared_mime_info
   ];
   postFixup =
     let k3bPath = lib.makeBinPath [