about summary refs log tree commit diff
path: root/pkgs/applications/graphics
diff options
context:
space:
mode:
authorAnthony Cowley <acowley@gmail.com>2023-10-18 16:15:13 -0400
committerGitHub <noreply@github.com>2023-10-18 16:15:13 -0400
commitef21b9f5aae97f984858ab748c00307d51ee14cc (patch)
tree2006b687ce5a7d086c6a0c8a47b05c48eee50f57 /pkgs/applications/graphics
parent9c7a70fc30d94632e2295d7f096de02784c89246 (diff)
parent5b689b360b87d6192e4a252d908510660d364e04 (diff)
downloadnixlib-ef21b9f5aae97f984858ab748c00307d51ee14cc.tar
nixlib-ef21b9f5aae97f984858ab748c00307d51ee14cc.tar.gz
nixlib-ef21b9f5aae97f984858ab748c00307d51ee14cc.tar.bz2
nixlib-ef21b9f5aae97f984858ab748c00307d51ee14cc.tar.lz
nixlib-ef21b9f5aae97f984858ab748c00307d51ee14cc.tar.xz
nixlib-ef21b9f5aae97f984858ab748c00307d51ee14cc.tar.zst
nixlib-ef21b9f5aae97f984858ab748c00307d51ee14cc.zip
Merge pull request #261875 from player131007/update-qview
qView: 5.0 -> 6.1
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r--pkgs/applications/graphics/qview/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix
index e5d148da8e6a..9bba92a2b5b7 100644
--- a/pkgs/applications/graphics/qview/default.nix
+++ b/pkgs/applications/graphics/qview/default.nix
@@ -6,19 +6,23 @@
 , qttools
 , qtimageformats
 , qtsvg
+, qtx11extras
+, x11Support ? true
 }:
 
 mkDerivation rec {
   pname = "qview";
-  version = "5.0";
+  version = "6.1";
 
   src = fetchFromGitHub {
     owner = "jurplel";
     repo = "qView";
     rev = version;
-    hash = "sha256-VQ0H9iPrrxO9e/kMo7yZ/zN5I2qDWBCAFacS9uGuZLI=";
+    hash = "sha256-h1K1Smfy875NoHtgUrOvZZp0IgcQdbyuQhXU9ndM4bA=";
   };
 
+  qmakeFlags = lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
+
   nativeBuildInputs = [ qmake ];
 
   buildInputs = [
@@ -26,7 +30,7 @@ mkDerivation rec {
     qttools
     qtimageformats
     qtsvg
-  ];
+  ] ++ lib.optionals x11Support [ qtx11extras ];
 
   meta = with lib; {
     description = "Practical and minimal image viewer";