From d7ee690ae7f94ba35562ab96a5caf70356d66695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Sun, 15 May 2022 18:23:52 -0300 Subject: [PATCH] ksmoothdock: 6.2 -> 6.3 Fixes build on recent compiler and qt versions --- pkgs/applications/misc/ksmoothdock/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix index e5cb6f5816e3..7325c85dbd4c 100644 --- a/pkgs/applications/misc/ksmoothdock/default.nix +++ b/pkgs/applications/misc/ksmoothdock/default.nix @@ -1,7 +1,6 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , extra-cmake-modules , kactivities @@ -10,28 +9,15 @@ mkDerivation rec { pname = "KSmoothDock"; - version = "6.2"; + version = "6.3"; src = fetchFromGitHub { owner = "dangvd"; repo = "ksmoothdock"; rev = "v${version}"; - sha256 = "182x47cymgnp5xisa0xx93hmd5wrfigy8zccrr23p4r9hp8xbnam"; + sha256 = "sha256-hO7xgjFMFrEhQs3oc2peFTjSVEDsl7Ma/TeVybEZMEk="; }; - patches = [ - # Fixed hard coded installation path to use CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_PREFIX instead - (fetchpatch { - url = "https://github.com/dangvd/ksmoothdock/commit/00799bef8a1c1fe61ef9274866267d9fe9194041.patch"; - sha256 = "1nmb7gf1ggzicxz8k4fd67xhwjy404myqzjpgjym66wqxm0arni4"; - }) - # Pull request to fix build on Qt 5.15 https://github.com/dangvd/ksmoothdock/pull/123 - (fetchpatch { - url = "https://github.com/dangvd/ksmoothdock/commit/259527aacadb0fd9110d4425b9bf41a15bedce72.patch"; - sha256 = "12nj58v9qqrynarn3gpywih3w27mr4n51z1b8mh0rfbnd2kib8dc"; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kactivities qtbase ];