git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #21511 from peterhoeg/u/kirigami
b4cab20Michael Raskin
pkgs/development/libraries/kirigami/v2.nixnew file+23
compare with master
unifiedsplit
@@ -0,0 +1,23 @@
1+{ stdenv, fetchurl, cmake, ecm, pkgconfig, plasma-framework, qtbase, qtquickcontrols2 }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "kirigami";
5+ version = "1.90.0";
6+ name = "${pname}2-${version}";
7+
8+ src = fetchurl {
9+ url = "mirror://kde/unstable/${pname}/${pname}-${version}.tar.xz";
10+ sha256 = "a5ca094a60d1cc48116cbed07bbe68be016773d2488a91e278859c90f59e64a8";
11+ };
12+
13+ buildInputs = [ qtbase qtquickcontrols2 plasma-framework ];
14+
15+ nativeBuildInputs = [ cmake pkgconfig ecm ];
16+
17+ meta = with stdenv.lib; {
18+ license = licenses.lgpl2;
19+ homepage = http://www.kde.org;
20+ maintainers = with maintainers; [ ttuegel peterhoeg ];
21+ platforms = platforms.unix;
22+ };
23+}
pkgs/development/libraries/qt-5/5.7/default.nix+1
@@ -82,6 +82,7 @@ let
82 inherit (pkgs.gst_all_1) gstreamer gst-plugins-base;
82 inherit (pkgs.gst_all_1) gstreamer gst-plugins-base;
83 };
83 };
84 qtquickcontrols = callPackage ./qtquickcontrols.nix {};
84 qtquickcontrols = callPackage ./qtquickcontrols.nix {};
85+ qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {};
85 qtscript = callPackage ./qtscript {};
86 qtscript = callPackage ./qtscript {};
86 qtsensors = callPackage ./qtsensors.nix {};
87 qtsensors = callPackage ./qtsensors.nix {};
87 qtserialport = callPackage ./qtserialport {};
88 qtserialport = callPackage ./qtserialport {};
pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nixnew file+6
@@ -0,0 +1,6 @@
1+{ qtSubmodule, qtdeclarative }:
2+
3+qtSubmodule {
4+ name = "qtquickcontrols2";
5+ qtInputs = [ qtdeclarative ];
6+}
pkgs/top-level/all-packages.nix+8−1
@@ -9089,7 +9089,14 @@ in
9089
9089
9090 grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };
9090 grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };
9091
9091
9092+ kirigami_1 = callPackage ../development/libraries/kirigami { };
9093+
9092− kirigami = callPackage ../development/libraries/kirigami { };
9094+ kirigami_2 = callPackage ../development/libraries/kirigami/v2.nix {
9095+ # kirigami v2 requires qt 5.7 and above
9096+ inherit (qt57) qtbase qtquickcontrols2;
9097+ };
9098+
9099+ kirigami = kirigami_1;
9093
9100
9094 libcommuni = callPackage ../development/libraries/libcommuni { };
9101 libcommuni = callPackage ../development/libraries/libcommuni { };
9095
9102