From 3e06c96f507e4cf458fb07a529a1c6e7741c0dd5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 28 Apr 2017 08:32:24 +0800 Subject: [PATCH] xca: now works with qt 5.8 --- pkgs/applications/misc/xca/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 60af439e94bb..09da875e2360 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1r2w9gpahjv221j963bd4vn0gj4cxmb9j42f3cd9qdn890hizw84"; }; - enableParallelBuilding = false; + enableParallelBuilding = true; buildInputs = [ libtool openssl qtbase qttools ]; @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.bsd3; maintainers = with maintainers; [ offline peterhoeg ]; - broken = builtins.compareVersions qtbase.version "5.7.0" >= 0; + 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 9a8c9b16f4d4..e743a15ee311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16279,7 +16279,7 @@ with pkgs; xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # v1.3.2 segfaults with qt 5.7 - xca = libsForQt56.callPackage ../applications/misc/xca { }; + xca = libsForQt5.callPackage ../applications/misc/xca { }; xcalib = callPackage ../tools/X11/xcalib { };