forked from mirrors/nixpkgs
kirigami_2: Do not mix Qt versions!
This commit is contained in:
parent
e39a4597ce
commit
c650dc8bd7
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue