Merge master into staging-next

2021-05-20 18:36:00 +00:00
parent 274ec21015 52770ccd46
commit 34a05e29f1
13 changed files with 166 additions and 30 deletions
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, ffmpeg_3, imagemagick, dzen2, xorg }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }:

 stdenv.mkDerivation {
  pname = "xscast-unstable";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
    patchShebangs $out/bin

    wrapProgram "$out/bin/xscast" \
-      --prefix PATH : ${lib.makeBinPath [ ffmpeg_3 dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]}
+      --prefix PATH : ${lib.makeBinPath [ ffmpeg dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]}

    runHook postInstall
  '';