git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #21057 from gnidorah/master3

qtstyleplugins: init at 2016-12-01, kdecoration-viewer: init at 2015-08-20

commitdd7dc94725764869cb3c39e099ec3094b6f11aec authorThomas Tuegel <ttuegel@gmail.com> dateSun 18 Dec 2016, 13:13 (10 years ago) parent4f57a25bb63d4a
3 files changed+58
compare with master
unifiedsplit
pkgs/development/libraries/qtstyleplugins/default.nix+27 pkgs/tools/misc/kdecoration-viewer/default.nix+27 pkgs/top-level/all-packages.nix+4
pkgs/development/libraries/qtstyleplugins/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ stdenv, fetchFromGitHub, qmakeHook, pkgconfig, gtk2 }:
2+
3+stdenv.mkDerivation rec {
4+ name = "qtstyleplugins-2016-12-01";
5+
6+ src = fetchFromGitHub {
7+ owner = "qt";
8+ repo = "qtstyleplugins";
9+ rev = "7aa47640c202cc4a9c16aa7df98191236743c8ba";
10+ sha256 = "0pysgn5yhbh85rv7syvf2w9g1gj1z1nwspjri39dc95vj108lin5";
11+ };
12+
13+ buildInputs = [ qmakeHook pkgconfig gtk2 ];
14+
15+ installPhase = ''
16+ make INSTALL_ROOT=$NIX_QT5_TMP install
17+ mv $NIX_QT5_TMP/$NIX_QT5_TMP $out
18+ '';
19+
20+ meta = with stdenv.lib; {
21+ description = "Additional style plugins for Qt5, including BB10, GTK+, Cleanlooks, Motif, Plastique";
22+ homepage = http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/;
23+ license = licenses.lgpl21;
24+ maintainers = [ maintainers.gnidorah ];
25+ platforms = platforms.linux;
26+ };
27+}
pkgs/tools/misc/kdecoration-viewer/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ stdenv, fetchFromGitHub
2+, cmake, ecm, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
3+
4+stdenv.mkDerivation rec {
5+ name = "kdecoration-viewer-2015-08-20";
6+
7+ src = fetchFromGitHub {
8+ owner = "KDE";
9+ repo = "kdecoration-viewer";
10+ rev = "d7174acee01475fbdb71cfd48ca49d487a141701";
11+ sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6";
12+ };
13+
14+ buildInputs = [ cmake ecm qtquickcontrols kconfigwidgets kdeclarative kdecoration ];
15+
16+ meta = with stdenv.lib; {
17+ description = "Allows to preview a KDecoration plugin";
18+ longDescription = ''
19+ kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under
20+ $QT_PLUGIN_PATH/org.kde.kdecoration2 to preview.
21+ '';
22+ homepage = https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/;
23+ license = licenses.gpl2;
24+ maintainers = [ maintainers.gnidorah ];
25+ platforms = platforms.linux;
26+ };
27+}
pkgs/top-level/all-packages.nix+4
@@ -9086,6 +9086,8 @@ in
90869086 withQt5 = true;
90879087 };
90889088
9089+ qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { };
9090+
90899091 quazip = callPackage ../development/libraries/quazip {
90909092 qt = qtbase;
90919093 };
@@ -13604,6 +13606,8 @@ in
1360413606
1360513607 kdeconnect = qt5.callPackage ../applications/misc/kdeconnect { };
1360613608
13609+ kdecoration-viewer = kde5.callPackage ../tools/misc/kdecoration-viewer {};
13610+
1360713611 kdevelop-pg-qt = kde5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {};
1360813612
1360913613 kdevelop = kde5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {