Merge pull request #65913 from worldofpeace/adwaita-qt/bump

adwaita-qt: 1.0 -> 1.1.0
This commit is contained in:
worldofpeace 2019-08-09 10:59:37 -04:00 committed by GitHub
commit 4b7ee55613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }:
{ mkDerivation, lib, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }:
stdenv.mkDerivation rec {
name = "qgnomeplatform-${version}";
mkDerivation rec {
pname = "qgnomeplatform";
version = "0.5";
src = fetchFromGitHub {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
--replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "QPlatformTheme for a better Qt application inclusion in GNOME";
homepage = https://github.com/FedoraQt/QGnomePlatform;
license = licenses.lgpl21Plus;

View File

@ -1,16 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, ninja, qtbase }:
{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase }:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "adwaita-qt";
version = "1.0";
name = "${pname}-${version}";
version = "1.1.0";
src = fetchFromGitHub {
owner = "FedoraQt";
repo = pname;
rev = version;
sha256 = "0xn8bianmdj15k11mnw52by9vxkmvpqr2s304kl3dbjj1l7v4cd7";
sha256 = "1jlh4l3sxiwglgx6h4aqi364gr4xipmn09bk88cp997r9sm8jcp9";
};
nativeBuildInputs = [
@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
--replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A style to bend Qt applications to look like they belong into GNOME Shell";
homepage = https://github.com/FedoraQt/adwaita-qt;
license = licenses.gpl2Plus;