public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
adwaita-qt: 1.0 -> 1.1.0
This commit is contained in:
worldofpeace
2019-08-09 10:59:37 -04:00
committed by GitHub
parent bd5ecb5337 327a4d5879
commit 4b7ee55613
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qgnomeplatform/default.nix
+4 -4
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }: { mkDerivation, lib, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }:
stdenv.mkDerivation rec { mkDerivation rec {
name = "qgnomeplatform-${version}"; pname = "qgnomeplatform";
version = "0.5"; version = "0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
--replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "QPlatformTheme for a better Qt application inclusion in GNOME"; description = "QPlatformTheme for a better Qt application inclusion in GNOME";
homepage = https://github.com/FedoraQt/QGnomePlatform; homepage = https://github.com/FedoraQt/QGnomePlatform;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
pkgs/misc/themes/adwaita-qt/default.nix
+5 -7
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"; pname = "adwaita-qt";
version = "1.0"; version = "1.1.0";
name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FedoraQt"; owner = "FedoraQt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0xn8bianmdj15k11mnw52by9vxkmvpqr2s304kl3dbjj1l7v4cd7"; sha256 = "1jlh4l3sxiwglgx6h4aqi364gr4xipmn09bk88cp997r9sm8jcp9";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
--replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles" --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"; description = "A style to bend Qt applications to look like they belong into GNOME Shell";
homepage = https://github.com/FedoraQt/adwaita-qt; homepage = https://github.com/FedoraQt/adwaita-qt;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;