uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
57
pkgs/applications/video/vokoscreen/default.nix
Normal file
57
pkgs/applications/video/vokoscreen/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{ 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
|
||||
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 = with lib; {
|
||||
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 = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.league ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
24
pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
Normal file
24
pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
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" );
|
||||
Loading…
Add table
Add a link
Reference in a new issue