ksmoothdock: 6.2 -> 6.3
Fixes build on recent compiler and qt versions
This commit is contained in:
parent
2fce45391a
commit
d7ee690ae7
|
@ -1,7 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, mkDerivation
|
, mkDerivation
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, cmake
|
, cmake
|
||||||
, extra-cmake-modules
|
, extra-cmake-modules
|
||||||
, kactivities
|
, kactivities
|
||||||
|
@ -10,28 +9,15 @@
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "KSmoothDock";
|
pname = "KSmoothDock";
|
||||||
version = "6.2";
|
version = "6.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dangvd";
|
owner = "dangvd";
|
||||||
repo = "ksmoothdock";
|
repo = "ksmoothdock";
|
||||||
rev = "v${version}";
|
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 ];
|
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||||
|
|
||||||
buildInputs = [ kactivities qtbase ];
|
buildInputs = [ kactivities qtbase ];
|
||||||
|
|
Loading…
Reference in a new issue