summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-11-04 18:01:04 +0000
committerGitHub <noreply@github.com>2023-11-04 18:01:04 +0000
commit870227bcb60f0d34915015fb077811011e458979 (patch)
treed484e754303a9b89ee1ea9eca5eb150b9078d4a3 /pkgs/tools
parentb746e1269b9ba28d8c26807933df96a69c9d1fc4 (diff)
parent33ce4c9fe1efcf0091f27e8caa544554dbf21707 (diff)
downloadnixpkgs-870227bcb60f0d34915015fb077811011e458979.tar
nixpkgs-870227bcb60f0d34915015fb077811011e458979.tar.gz
nixpkgs-870227bcb60f0d34915015fb077811011e458979.tar.bz2
nixpkgs-870227bcb60f0d34915015fb077811011e458979.tar.lz
nixpkgs-870227bcb60f0d34915015fb077811011e458979.tar.xz
nixpkgs-870227bcb60f0d34915015fb077811011e458979.tar.zst
nixpkgs-870227bcb60f0d34915015fb077811011e458979.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/graphics/escrotum/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix
index 08136f57ef8..04c245dbd9a 100644
--- a/pkgs/tools/graphics/escrotum/default.nix
+++ b/pkgs/tools/graphics/escrotum/default.nix
@@ -1,4 +1,5 @@
 { lib, python3Packages, fetchFromGitHub
+, ffmpeg-full
 , gtk3
 , pango
 , gobject-introspection
@@ -33,6 +34,8 @@ with python3Packages; buildPythonApplication {
 
   outputs = [ "out" "man" ];
 
+  makeWrapperArgs = ["--prefix PATH : ${lib.makeBinPath [ ffmpeg-full ]}"];
+
   postInstall = ''
     mkdir -p $man/share/man/man1
     cp man/escrotum.1 $man/share/man/man1/