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
60
pkgs/applications/graphics/qimgv/default.nix
Normal file
60
pkgs/applications/graphics/qimgv/default.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{ mkDerivation
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
|
||||
, cmake
|
||||
, pkg-config
|
||||
|
||||
, exiv2
|
||||
, mpv
|
||||
, opencv4
|
||||
, qtbase
|
||||
, qtimageformats
|
||||
, qtsvg
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qimgv";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "easymodo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YlV/ysm7bdPverpKpanrL+jPVvMtP1paoAm0PREMaww=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
exiv2
|
||||
mpv
|
||||
opencv4
|
||||
qtbase
|
||||
qtimageformats
|
||||
qtsvg
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "s@/usr/bin/mpv@${mpv}/bin/mpv@" \
|
||||
qimgv/settings.cpp
|
||||
'';
|
||||
|
||||
# Wrap the library path so it can see `libqimgv_player_mpv.so`, which is used
|
||||
# to play video files within qimgv itself.
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Qt5 image viewer with optional video support";
|
||||
homepage = "https://github.com/easymodo/qimgv";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ cole-h ];
|
||||
};
|
||||
}
|
||||
13
pkgs/applications/graphics/qimgv/qt5-12-compat.diff
Normal file
13
pkgs/applications/graphics/qimgv/qt5-12-compat.diff
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
|
||||
index 96ec9d3..6d95d08 100644
|
||||
--- a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
|
||||
+++ b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
|
||||
@@ -21,7 +21,7 @@ void LinuxWorker::setDescriptor(int desc) {
|
||||
|
||||
void LinuxWorker::run() {
|
||||
emit started();
|
||||
- isRunning.storeRelaxed(true);
|
||||
+ isRunning.store(true);
|
||||
|
||||
if (fd == -1) {
|
||||
qDebug() << TAG << "File descriptor isn't set! Stopping";
|
||||
Loading…
Add table
Add a link
Reference in a new issue