Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 37d232fb5f58
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d20bfc72cb0e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 31, 2019

  1. vokoscreen: 2.5.0 -> 2.5.8-beta

    @GRBurst
    GRBurst committed May 31, 2019
    Copy the full SHA
    8e0b32e View commit details

  2. vokoscreen: 2.5.0 -> 2.5.8-beta (#62144) 

    vokoscreen: 2.5.0 -> 2.5.8-beta
    @jtojnar
    jtojnar authored May 31, 2019
    Copy the full SHA
    d20bfc7 View commit details
Showing with 20 additions and 22 deletions.
  1. +15 −10 pkgs/applications/video/vokoscreen/default.nix
  2. +5 −12 pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
25 changes: 15 additions & 10 deletions pkgs/applications/video/vokoscreen/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
{ stdenv, fetchgit
, pkgconfig, qtbase, qttools, qmake, qtx11extras, alsaLib, libv4l, libXrandr
{ stdenv, fetchFromGitHub
, pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr
, ffmpeg
}:

stdenv.mkDerivation {
name = "vokoscreen-2.5.0";
src = fetchgit {
url = "https://github.com/vkohaupt/vokoscreen.git";
rev = "8325c8658d6e777d34d2e6b8c8bc03f8da9b3d2f";
sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z";
stdenv.mkDerivation rec {

pname = "vokoscreen";
version = "2.5.8-beta";

src = fetchFromGitHub {
owner = "vkohaupt";
repo = "vokoscreen";
rev = version;
sha256 = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan";
};

nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
alsaLib
libv4l
qtbase
qtmultimedia
qttools
qtx11extras
libXrandr
@@ -35,14 +40,14 @@ stdenv.mkDerivation {

meta = with stdenv.lib; {
description = "Simple GUI screencast recorder, using ffmpeg";
homepage = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html;
homepage = "http://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 = licenses.gpl2Plus;
maintainers = [maintainers.league];
maintainers = [ maintainers.league ];
platforms = platforms.linux;
};
}
17 changes: 5 additions & 12 deletions pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@
diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp
index bbf2abf..187efad 100644
index 3008e62..07485bd 100644
--- a/settings/QvkSettings.cpp
+++ b/settings/QvkSettings.cpp
@@ -56,17 +56,8 @@ void QvkSettings::readAll()
GIFPlayer = settings.value( "GIFplayer" ).toString();
@@ -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;
- vokoscreenWithLibs = true;
- Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" );
- }
- else
- {
- vokoscreenWithLibs = false;
- vokoscreenWithLibs = false;
- Recorder = settings.value( "Recorder", "ffmpeg" ).toString();
- }
+ vokoscreenWithLibs = true;
+ Recorder = settings.value( "Recorder", "@ffmpeg@/bin/ffmpeg" ).toString();
settings.endGroup();

settings.beginGroup( "Videooptions" );
@@ -398,4 +389,4 @@ double QvkSettings::getShowClickTime()
int QvkSettings::getShowKeyOnOff()
{
return showKeyOnOff;
-}
\ No newline at end of file
+}