diff --git a/pkgs/development/libraries/kirigami/v2.nix b/pkgs/development/libraries/kirigami/v2.nix new file mode 100644 index 000000000000..8476eebfd501 --- /dev/null +++ b/pkgs/development/libraries/kirigami/v2.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, cmake, ecm, pkgconfig, plasma-framework, qtbase, qtquickcontrols2 }: + +stdenv.mkDerivation rec { + pname = "kirigami"; + version = "1.90.0"; + name = "${pname}2-${version}"; + + src = fetchurl { + url = "mirror://kde/unstable/${pname}/${pname}-${version}.tar.xz"; + sha256 = "a5ca094a60d1cc48116cbed07bbe68be016773d2488a91e278859c90f59e64a8"; + }; + + buildInputs = [ qtbase qtquickcontrols2 plasma-framework ]; + + nativeBuildInputs = [ cmake pkgconfig ecm ]; + + meta = with stdenv.lib; { + license = licenses.lgpl2; + homepage = http://www.kde.org; + maintainers = with maintainers; [ ttuegel peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index 9c35e814a04e..d62bd3d1b51d 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -82,6 +82,7 @@ let inherit (pkgs.gst_all_1) gstreamer gst-plugins-base; }; qtquickcontrols = callPackage ./qtquickcontrols.nix {}; + qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {}; qtscript = callPackage ./qtscript {}; qtsensors = callPackage ./qtsensors.nix {}; qtserialport = callPackage ./qtserialport {}; diff --git a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix new file mode 100644 index 000000000000..19750f2fd99d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtdeclarative }: + +qtSubmodule { + name = "qtquickcontrols2"; + qtInputs = [ qtdeclarative ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96ea68a9dd0c..e414df533020 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9089,7 +9089,14 @@ in grantlee = callPackage ../development/libraries/grantlee/5.x.nix { }; - kirigami = callPackage ../development/libraries/kirigami { }; + 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 = kirigami_1; libcommuni = callPackage ../development/libraries/libcommuni { };