From c650dc8bd7b62bcbeb640657a9408f152b278f3e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 25 Feb 2017 13:47:52 -0600 Subject: [PATCH] kirigami_2: Do not mix Qt versions! --- pkgs/development/libraries/kirigami/v2.nix | 1 + pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kirigami/v2.nix b/pkgs/development/libraries/kirigami/v2.nix index 8476eebfd501..7dc6e799bcf8 100644 --- a/pkgs/development/libraries/kirigami/v2.nix +++ b/pkgs/development/libraries/kirigami/v2.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.kde.org; maintainers = with maintainers; [ ttuegel peterhoeg ]; platforms = platforms.unix; + 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 bb9f348e87ea..c3e02816e498 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9350,10 +9350,7 @@ with pkgs; kirigami_1 = callPackage ../development/libraries/kirigami { }; - kirigami_2 = callPackage ../development/libraries/kirigami/v2.nix { - # kirigami v2 requires qt 5.7 and above - inherit (qt57) qtbase qtquickcontrols2; - }; + kirigami_2 = callPackage ../development/libraries/kirigami/v2.nix { }; kirigami = kirigami_1;