From 30360cb0455ffd9bf5da5bd474afce9374fbb9e3 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Mon, 12 Aug 2019 21:34:33 +1000 Subject: [PATCH 1/2] qtstyleplugin-kvantum: use wrapQtAppsHook Shouldn't be needed for the style engine itself to work, but it is needed for `kvantummanager` and `kvantumpreview`. --- .../libraries/qtstyleplugin-kvantum/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index dc11cb560910..46cf8668b227 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem, libX11, libXext, qttools }: +{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem +, libX11, libXext, qttools, wrapQtAppsHook +}: stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; @@ -11,8 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g"; }; - nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase qtsvg qtx11extras kwindowsystem libX11 libXext ]; + nativeBuildInputs = [ + qmake qttools wrapQtAppsHook + ]; + buildInputs = [ + qtbase qtsvg qtx11extras kwindowsystem libX11 libXext + ]; sourceRoot = "source/Kvantum"; From e89f861ec565feb7cd10f261b23884c73208e1e7 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Mon, 26 Aug 2019 10:56:03 +1000 Subject: [PATCH 2/2] qtstyleplugin-kvantum{,-qt4}: 0.11.0 -> 0.11.2 --- .../libraries/qtstyleplugin-kvantum-qt4/default.nix | 4 ++-- pkgs/development/libraries/qtstyleplugin-kvantum/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 88330712dcd4..7c2a99804c4d 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g"; + sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 46cf8668b227..71ca8e720a41 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g"; + sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc"; }; nativeBuildInputs = [