diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 1fb3a415dc6..94c69a4a14b 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -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; diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/misc/themes/adwaita-qt/default.nix index f2a682bcf7d..9b979a11b93 100644 --- a/pkgs/misc/themes/adwaita-qt/default.nix +++ b/pkgs/misc/themes/adwaita-qt/default.nix @@ -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;