Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: pkgs/shells/ion/default.nix pkgs/tools/misc/cicero-tui/default.nix
2021-05-20 22:11:42 -07:00
parent 34a05e29f1 788deaad9d
commit 6b15fdce86
79 changed files with 17575 additions and 547 deletions
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub
-, ffmpeg_3
+, ffmpeg
 , imagemagick
 , makeWrapper
 , mplayer
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

    install -Dm755 gopro -t $out/bin
    wrapProgram $out/bin/gopro \
-      --prefix PATH ":" "${lib.makeBinPath [ ffmpeg_3 imagemagick mplayer ]}"
+      --prefix PATH ":" "${lib.makeBinPath [ ffmpeg imagemagick mplayer ]}"

    runHook postInstall
  '';