From 4ae35110aab7605436ea3e4ba76c4134d3324e29 Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Sun, 21 Dec 2025 10:35:39 -0500 Subject: [PATCH] vokoscreen: drop --- .../applications/video/vokoscreen/default.nix | 72 ------------------- .../video/vokoscreen/ffmpeg-out-of-box.patch | 24 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 4 files changed, 1 insertion(+), 100 deletions(-) delete mode 100644 pkgs/applications/video/vokoscreen/default.nix delete mode 100644 pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix deleted file mode 100644 index 108ada943c46..000000000000 --- a/pkgs/applications/video/vokoscreen/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - fetchFromGitHub, - mkDerivation, - pkg-config, - qtbase, - qttools, - qmake, - qtmultimedia, - qtx11extras, - alsa-lib, - libv4l, - libXrandr, - ffmpeg, -}: - -mkDerivation rec { - - pname = "vokoscreen"; - version = "2.5.8-beta"; - - src = fetchFromGitHub { - owner = "vkohaupt"; - repo = "vokoscreen"; - rev = version; - sha256 = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan"; - }; - - nativeBuildInputs = [ - pkg-config - qmake - ]; - buildInputs = [ - alsa-lib - libv4l - qtbase - qtmultimedia - qttools - qtx11extras - libXrandr - ]; - - patches = [ - ./ffmpeg-out-of-box.patch - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: alsa_device.o:(.bss+0x8): multiple definition of `rc'; QvkAlsaDevice.o:(.bss+0x8): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure = '' - sed -i 's/lrelease-qt5/lrelease/g' vokoscreen.pro - ''; - - postConfigure = '' - substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg} - ''; - - meta = { - description = "Simple GUI screencast recorder, using ffmpeg"; - homepage = "https://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"; - longDescription = '' - vokoscreen is an easy to use screencast creator to record - educational videos, live recordings of browser, installation, - videoconferences, etc. - ''; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.league ]; - platforms = lib.platforms.linux; - mainProgram = "vokoscreen"; - }; -} diff --git a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch deleted file mode 100644 index afcee3f9715f..000000000000 --- a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp -index 3008e62..07485bd 100644 ---- a/settings/QvkSettings.cpp -+++ b/settings/QvkSettings.cpp -@@ -66,17 +66,8 @@ void QvkSettings::readAll() - Minimized = settings.value( "Minimized", 0 ).toUInt(); - MinimizedByStart = settings.value( "MinimizedByStart", 0 ).toUInt(); - Countdown = settings.value( "Countdown", 0 ).toUInt(); -- QFile file; -- if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true ) -- { -- vokoscreenWithLibs = true; -- Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" ); -- } -- else -- { -- vokoscreenWithLibs = false; -- Recorder = settings.value( "Recorder", "ffmpeg" ).toString(); -- } -+ vokoscreenWithLibs = true; -+ Recorder = settings.value( "Recorder", "@ffmpeg@/bin/ffmpeg" ).toString(); - settings.endGroup(); - - settings.beginGroup( "Videooptions" ); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 50ebf60ae40f..9125a8cb6017 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1669,6 +1669,7 @@ mapAliases { vistafonts-cht = throw "'vistafonts-cht' has been renamed to/replaced by 'vista-fonts-cht'"; # Converted to throw 2025-10-27 vkBasalt = throw "'vkBasalt' has been renamed to/replaced by 'vkbasalt'"; # Converted to throw 2025-10-27 vkdt-wayland = throw "'vkdt-wayland' has been renamed to/replaced by 'vkdt'"; # Converted to throw 2025-10-27 + vokoscreen = throw "'vokoscreen' has been replaced by vokoscreen-ng"; # Added 2025-10-21 volk_2 = throw "'volk_2' has been removed after not being used by any package for a long time"; # Added 2025-10-25 volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream. Consider using 'rumno' instead."; # Added 2024-12-04 voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1ad51ba358c..7bc3b9a3d20e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13960,10 +13960,6 @@ with pkgs; vivisect = with python3Packages; toPythonApplication (vivisect.override { withGui = true; }); - vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { - ffmpeg = ffmpeg-full; - }; - py-wacz = with python3Packages; toPythonApplication wacz; wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { };