kirigami: add pre-release v2

It requires qt5.7
This commit is contained in:
Peter Hoeg 2016-12-30 10:48:06 +08:00
parent c311871a6d
commit 2dcbb8e81f
4 changed files with 38 additions and 1 deletions

View file

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

View file

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

View file

@ -0,0 +1,6 @@
{ qtSubmodule, qtdeclarative }:
qtSubmodule {
name = "qtquickcontrols2";
qtInputs = [ qtdeclarative ];
}

View file

@ -9082,7 +9082,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 { };