Merge pull request #21057 from gnidorah/master3

qtstyleplugins: init at 2016-12-01, kdecoration-viewer: init at 2015-08-20
This commit is contained in:
Thomas Tuegel 2016-12-18 13:13:58 -06:00 committed by GitHub
commit dd7dc94725
3 changed files with 58 additions and 0 deletions

View file

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, qmakeHook, pkgconfig, gtk2 }:
stdenv.mkDerivation rec {
name = "qtstyleplugins-2016-12-01";
src = fetchFromGitHub {
owner = "qt";
repo = "qtstyleplugins";
rev = "7aa47640c202cc4a9c16aa7df98191236743c8ba";
sha256 = "0pysgn5yhbh85rv7syvf2w9g1gj1z1nwspjri39dc95vj108lin5";
};
buildInputs = [ qmakeHook pkgconfig gtk2 ];
installPhase = ''
make INSTALL_ROOT=$NIX_QT5_TMP install
mv $NIX_QT5_TMP/$NIX_QT5_TMP $out
'';
meta = with stdenv.lib; {
description = "Additional style plugins for Qt5, including BB10, GTK+, Cleanlooks, Motif, Plastique";
homepage = http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/;
license = licenses.lgpl21;
maintainers = [ maintainers.gnidorah ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub
, cmake, ecm, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
stdenv.mkDerivation rec {
name = "kdecoration-viewer-2015-08-20";
src = fetchFromGitHub {
owner = "KDE";
repo = "kdecoration-viewer";
rev = "d7174acee01475fbdb71cfd48ca49d487a141701";
sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6";
};
buildInputs = [ cmake ecm qtquickcontrols kconfigwidgets kdeclarative kdecoration ];
meta = with stdenv.lib; {
description = "Allows to preview a KDecoration plugin";
longDescription = ''
kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under
$QT_PLUGIN_PATH/org.kde.kdecoration2 to preview.
'';
homepage = https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/;
license = licenses.gpl2;
maintainers = [ maintainers.gnidorah ];
platforms = platforms.linux;
};
}

View file

@ -9086,6 +9086,8 @@ in
withQt5 = true;
};
qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { };
quazip = callPackage ../development/libraries/quazip {
qt = qtbase;
};
@ -13604,6 +13606,8 @@ in
kdeconnect = qt5.callPackage ../applications/misc/kdeconnect { };
kdecoration-viewer = kde5.callPackage ../tools/misc/kdecoration-viewer {};
kdevelop-pg-qt = kde5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {};
kdevelop = kde5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {