about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-05-12 16:45:27 +0800
committerPeter Hoeg <peter@hoeg.com>2017-05-12 16:45:43 +0800
commite25665591b66038c668418c58eaf2810d8f1c90e (patch)
tree7cea870a8b6fa9ecba3bdfe086f6221d240caec9
parent4f51a1ef3295d6a71382597bd6a486643d76f95f (diff)
downloadnixlib-e25665591b66038c668418c58eaf2810d8f1c90e.tar
nixlib-e25665591b66038c668418c58eaf2810d8f1c90e.tar.gz
nixlib-e25665591b66038c668418c58eaf2810d8f1c90e.tar.bz2
nixlib-e25665591b66038c668418c58eaf2810d8f1c90e.tar.lz
nixlib-e25665591b66038c668418c58eaf2810d8f1c90e.tar.xz
nixlib-e25665591b66038c668418c58eaf2810d8f1c90e.tar.zst
nixlib-e25665591b66038c668418c58eaf2810d8f1c90e.zip
qsyncthingtray: build with qt 5.6
-rw-r--r--pkgs/applications/misc/qsyncthingtray/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index c314a226b26b..d6aea74d9972 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl3;
     maintainers = with maintainers; [ zraexy peterhoeg ];
     platforms = platforms.all;
-    # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK
-    broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
+    # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
+    broken = builtins.compareVersions qtbase.version "5.7.0" >= 0;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 696b65ef6907..8609b162558e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15391,8 +15391,8 @@ with pkgs;
     qt = qt4;
   };
 
-  # 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK
-  qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
+  # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
+  qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };