diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-03 00:13:16 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-03 00:13:16 +0000 |
commit | 26d2f291dffdcb7e5f40896be3fc3bc72538dbd0 (patch) | |
tree | 5eab6c80968fb769f5433bc2fa6b96f102d17701 /pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch | |
parent | 2918b2c876b74d0ba5e333676ee86228f51c24e8 (diff) | |
parent | 172094c8c1f83ee7f6d7dd10e64fdc7da0e4ac3b (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch')
-rw-r--r-- | pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch b/pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch new file mode 100644 index 0000000000000..f6fb777e186e9 --- /dev/null +++ b/pkgs/by-name/vd/vdhcoapp/ffmpeg-filepicker.patch @@ -0,0 +1,46 @@ +diff --git a/src/converter.js b/src/converter.js +index af7b4c3..20da407 100644 +--- a/src/converter.js ++++ b/src/converter.js +@@ -1,4 +1,4 @@ +-import open from 'open'; ++const open = import('open'); + + const os = require("os"); + const path = require('path'); +@@ -9,9 +9,9 @@ const rpc = require('./weh-rpc'); + + const exec_dir = path.dirname(process.execPath); + +-const ffmpeg = findExecutableFullPath("ffmpeg", exec_dir); +-const ffprobe = findExecutableFullPath("ffprobe", exec_dir); +-const filepicker = findExecutableFullPath("filepicker", exec_dir); ++const ffmpeg = "@ffmpeg@/bin/ffmpeg"; ++const ffprobe = "@ffmpeg@/bin/ffprobe"; ++const filepicker = "@filepicker@"; + + if (!fileExistsSync(ffmpeg)) { + logger.error("ffmpeg not found. Install ffmpeg and make sure it's in your path."); +diff --git a/src/main.js b/src/main.js +index 47b92de..e2e9402 100644 +--- a/src/main.js ++++ b/src/main.js +@@ -1,4 +1,4 @@ +-const config = require('config.json'); ++const config = require('./config.json'); + const converter = require('./converter'); + const os = require("os"); + +diff --git a/src/native-autoinstall.js b/src/native-autoinstall.js +index 556a22b..c729568 100644 +--- a/src/native-autoinstall.js ++++ b/src/native-autoinstall.js +@@ -1,7 +1,7 @@ + const os = require("os"); + const path = require("path"); + const { spawn, exec } = require('child_process'); +-const config = require('config.json'); ++const config = require('./config.json'); + + let fs; + if (process.versions.node.startsWith("10")) { \ No newline at end of file |