kirigami_2: Do not mix Qt versions!

This commit is contained in:
Thomas Tuegel 2017-02-25 13:47:52 -06:00
parent e39a4597ce
commit c650dc8bd7
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
2 changed files with 2 additions and 4 deletions

View file

@ -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;
};
}

View file

@ -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;