aland/nixpkgs-odroid-hc4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

Browse source 
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:
Anton Arapov 2021-04-03 12:58:10 +02:00 • committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch Normal file
View 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" );