diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/qimgv')
-rw-r--r-- | nixpkgs/pkgs/applications/graphics/qimgv/default.nix | 7 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/graphics/qimgv/qt5-12-compat.diff | 13 |
2 files changed, 18 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/qimgv/default.nix b/nixpkgs/pkgs/applications/graphics/qimgv/default.nix index 2756d659edf..2b24a34fbc2 100644 --- a/nixpkgs/pkgs/applications/graphics/qimgv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/qimgv/default.nix @@ -1,12 +1,14 @@ { mkDerivation , lib , fetchFromGitHub +, fetchpatch , cmake , pkgconfig , exiv2 , mpv +, opencv4 , qtbase , qtimageformats , qtsvg @@ -14,13 +16,13 @@ mkDerivation rec { pname = "qimgv"; - version = "0.8.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "easymodo"; repo = pname; rev = "v${version}"; - sha256 = "0cmya06j466v0pirhxbzbj1vbz0346y7rbc1gbv4n9xcp6c6bln6"; + sha256 = "0b2hddps969gjim2r9a22zaxmnzp600av2zz6icq66ksfrx1rpac"; }; nativeBuildInputs = [ @@ -31,6 +33,7 @@ mkDerivation rec { buildInputs = [ exiv2 mpv + opencv4 qtbase qtimageformats qtsvg diff --git a/nixpkgs/pkgs/applications/graphics/qimgv/qt5-12-compat.diff b/nixpkgs/pkgs/applications/graphics/qimgv/qt5-12-compat.diff new file mode 100644 index 00000000000..da64759e22d --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/qimgv/qt5-12-compat.diff @@ -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"; |