vdhcoapp: drop
This commit is contained in:
@@ -1,46 +0,0 @@
|
||||
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")) {
|
||||
@@ -1,41 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
atk,
|
||||
gtk3,
|
||||
glib,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "filepicker";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paulrouget";
|
||||
repo = "static-filepicker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7sRzf3SA9RSBf4O36olXgka8c6Bufdb0qsuTofVe55s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HUNBGG1+LsjaDsJS4p5aAdCRyltylQUtdydGSoUdNgo=";
|
||||
|
||||
buildInputs = [
|
||||
atk
|
||||
gtk3
|
||||
glib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "File picker used by VDHCoApp";
|
||||
homepage = "https://github.com/paulrouget/static-filepicker";
|
||||
license = lib.licenses.gpl2;
|
||||
mainProgram = "filepicker";
|
||||
maintainers = with lib.maintainers; [ hannesgith ];
|
||||
};
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
nodejs,
|
||||
ffmpeg,
|
||||
callPackage,
|
||||
replaceVars,
|
||||
makeWrapper,
|
||||
toml2json,
|
||||
jq,
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "vdhcoapp";
|
||||
version = "2.0.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aclap-dev";
|
||||
repo = "vdhcoapp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8xeZvqpRq71aShVogiwlVD3gQoPGseNOmz5E3KbsZxU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/app";
|
||||
npmDepsHash = "sha256-E032U2XZdyTER6ROkBosOTn7bweDXHl8voC3BQEz8Wg=";
|
||||
dontNpmBuild = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
toml2json
|
||||
jq
|
||||
];
|
||||
|
||||
patches = [
|
||||
(replaceVars ./ffmpeg-filepicker.patch {
|
||||
inherit ffmpeg;
|
||||
filepicker = lib.getExe (callPackage ./filepicker.nix { });
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Cannot use patch, setting placeholder here
|
||||
substituteInPlace src/native-autoinstall.js \
|
||||
--replace process.execPath "\"${placeholder "out"}/bin/vdhcoapp\""
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
toml2json --pretty ../config.toml > src/config.json
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/opt/vdhcoapp
|
||||
cp -r . "$out/opt/vdhcoapp"
|
||||
|
||||
makeWrapper ${nodejs}/bin/node $out/bin/vdhcoapp \
|
||||
--add-flags $out/opt/vdhcoapp/src/main.js
|
||||
|
||||
generateManifest() {
|
||||
type=$1
|
||||
outputFolder=$2
|
||||
mkdir -p $outputFolder
|
||||
manifestName=$(jq -r '.meta.id' src/config.json).json
|
||||
jq '.store.'$type'.manifest * (.meta | with_entries(select (.key == "description")) * {"name": .id}) * {"path" : "${placeholder "out"}/bin/vdhcoapp"}' src/config.json > $outputFolder/$manifestName
|
||||
}
|
||||
|
||||
generateManifest google $out/etc/opt/chrome/native-messaging-hosts
|
||||
generateManifest google $out/etc/chromium/native-messaging-hosts
|
||||
generateManifest mozilla $out/lib/mozilla/native-messaging-hosts
|
||||
generateManifest google $out/etc/opt/edge/native-messaging-hosts
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Companion application for the Video DownloadHelper browser add-on";
|
||||
homepage = "https://www.downloadhelper.net/";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ hannesgith ];
|
||||
mainProgram = "vdhcoapp";
|
||||
};
|
||||
}
|
||||
@@ -1797,6 +1797,7 @@ mapAliases {
|
||||
vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11
|
||||
vboot_reference = vboot-utils; # Added 2025-11-01
|
||||
vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20
|
||||
vdhcoapp = throw "VDH >= 10 doesn't require a companion app and the repo has been archived."; # Added 2026-01-26
|
||||
vdirsyncerStable = throw "'vdirsyncerStable' has been renamed to/replaced by 'vdirsyncer'"; # Converted to throw 2025-10-27
|
||||
ventoy-bin = throw "'ventoy-bin' has been renamed to/replaced by 'ventoy'"; # Converted to throw 2025-10-27
|
||||
ventoy-bin-full = throw "'ventoy-bin-full' has been renamed to/replaced by 'ventoy-full'"; # Converted to throw 2025-10-27
|
||||
|
||||
Reference in New Issue
Block a user