From e25665591b66038c668418c58eaf2810d8f1c90e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 12 May 2017 16:45:27 +0800 Subject: [PATCH] qsyncthingtray: build with qt 5.6 --- pkgs/applications/misc/qsyncthingtray/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index c314a226b26..d6aea74d997 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 696b65ef690..8609b162558 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 { };