summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2021-05-06 10:34:32 -0500
committerGitHub <noreply@github.com>2021-05-06 10:34:32 -0500
commit354895110934c4f2aa99e4e18380ba6bac11bba9 (patch)
tree30a85d137f06b20050801d4694ccf7b8f35bc511
parent0fbace6296c3888e2be33411c25c3ad2ab196bc9 (diff)
parent9aea36aae2e4c117e4ee186599725c2ab3e907ec (diff)
downloadnixpkgs-354895110934c4f2aa99e4e18380ba6bac11bba9.tar
nixpkgs-354895110934c4f2aa99e4e18380ba6bac11bba9.tar.gz
nixpkgs-354895110934c4f2aa99e4e18380ba6bac11bba9.tar.bz2
nixpkgs-354895110934c4f2aa99e4e18380ba6bac11bba9.tar.lz
nixpkgs-354895110934c4f2aa99e4e18380ba6bac11bba9.tar.xz
nixpkgs-354895110934c4f2aa99e4e18380ba6bac11bba9.tar.zst
nixpkgs-354895110934c4f2aa99e4e18380ba6bac11bba9.zip
Merge pull request #121256 from FliegendeWurst/k3b-ffmpeg
k3b: ffmpeg_3 -> ffmpeg
-rw-r--r--pkgs/applications/kde/k3b.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index cc9763961f8..eed3a4fac12 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -4,7 +4,7 @@
 , flac, lame, libmad, libmpcdec, libvorbis
 , libsamplerate, libsndfile, taglib
 , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
-, ffmpeg_3, libmusicbrainz3, normalize, sox, transcode, kinit
+, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit
 }:
 
 mkDerivation {
@@ -25,7 +25,7 @@ mkDerivation {
     # cd/dvd
     cdparanoia libdvdcss libdvdread
     # others
-    ffmpeg_3 libmusicbrainz3 shared-mime-info
+    ffmpeg libmusicbrainz3 shared-mime-info
   ];
   propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
   postFixup =