nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 18:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

vokoscreen: 2.5.0 -> 2.5.8-beta

Browse Source
This commit is contained in:
GRBurst 2019-04-22 22:20:53 +02:00
parent a3f8a25ab3
commit 8e0b32ecd6
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/video/vokoscreen/default.nix
View File

@ -1,14 +1,18 @@
{ stdenv, fetchgit { stdenv, fetchFromGitHub
, pkgconfig, qtbase, qttools, qmake, qtx11extras, alsaLib, libv4l, libXrandr , pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr
, ffmpeg , ffmpeg
}: }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "vokoscreen-2.5.0";
src = fetchgit { pname = "vokoscreen";
url = "https://github.com/vkohaupt/vokoscreen.git"; version = "2.5.8-beta";
rev = "8325c8658d6e777d34d2e6b8c8bc03f8da9b3d2f";
sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z"; src = fetchFromGitHub {
owner = "vkohaupt";
repo = "vokoscreen";
rev = version;
sha256 = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan";
}; };
nativeBuildInputs = [ pkgconfig qmake ]; nativeBuildInputs = [ pkgconfig qmake ];
@ -16,6 +20,7 @@ stdenv.mkDerivation {
alsaLib alsaLib
libv4l libv4l
qtbase qtbase
qtmultimedia
qttools qttools
qtx11extras qtx11extras
libXrandr libXrandr
@ -35,14 +40,14 @@ stdenv.mkDerivation {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Simple GUI screencast recorder, using ffmpeg"; description = "Simple GUI screencast recorder, using ffmpeg";
homepage = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html; homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html";
longDescription = '' longDescription = ''
vokoscreen is an easy to use screencast creator to record vokoscreen is an easy to use screencast creator to record
educational videos, live recordings of browser, installation, educational videos, live recordings of browser, installation,
videoconferences, etc. videoconferences, etc.
''; '';
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [maintainers.league]; maintainers = [ maintainers.league ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

17
pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
View File

@ -1,20 +1,20 @@
diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp
index bbf2abf..187efad 100644 index 3008e62..07485bd 100644
--- a/settings/QvkSettings.cpp --- a/settings/QvkSettings.cpp
+++ b/settings/QvkSettings.cpp +++ b/settings/QvkSettings.cpp
@@ -56,17 +56,8 @@ void QvkSettings::readAll() @@ -66,17 +66,8 @@ void QvkSettings::readAll()
GIFPlayer = settings.value( "GIFplayer" ).toString();
Minimized = settings.value( "Minimized", 0 ).toUInt(); Minimized = settings.value( "Minimized", 0 ).toUInt();
MinimizedByStart = settings.value( "MinimizedByStart", 0 ).toUInt();
Countdown = settings.value( "Countdown", 0 ).toUInt(); Countdown = settings.value( "Countdown", 0 ).toUInt();
- QFile file; - QFile file;
- if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true ) - if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true )
- { - {
- vokoscreenWithLibs = true; - vokoscreenWithLibs = true;
- Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" ); - Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" );
- } - }
- else - else
- { - {
- vokoscreenWithLibs = false; - vokoscreenWithLibs = false;
- Recorder = settings.value( "Recorder", "ffmpeg" ).toString(); - Recorder = settings.value( "Recorder", "ffmpeg" ).toString();
- } - }
+ vokoscreenWithLibs = true; + vokoscreenWithLibs = true;
@ -22,10 +22,3 @@ index bbf2abf..187efad 100644
settings.endGroup(); settings.endGroup();
settings.beginGroup( "Videooptions" ); settings.beginGroup( "Videooptions" );
@@ -398,4 +389,4 @@ double QvkSettings::getShowClickTime()
int QvkSettings::getShowKeyOnOff()
{
return showKeyOnOff;
-}
\ No newline at end of file
+}