diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-06-04 21:27:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-06-04 21:27:03 +0000 |
commit | 5487bcdfdd2c750274761263f3d65c00d7f6897b (patch) | |
tree | 6584bf52d6b70a59e10cd8eef51280f42ad2afa8 /pkgs/applications/misc/ksmoothdock/default.nix | |
parent | 8b9edf1e0fa01a9de7db6ead1b7b28f23b91b3e2 (diff) | |
parent | 1623d81e507520b5207307bc2bf8cfcddf90944a (diff) | |
download | nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.gz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.bz2 nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.lz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.xz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.zst nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.zip |
Rebase onto 236cc2971ac72acd90f0ae3a797f9f83098b17ec
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/applications/misc/ksmoothdock/default.nix')
-rw-r--r-- | pkgs/applications/misc/ksmoothdock/default.nix | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix index e5cb6f5816e..7325c85dbd4 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 ]; |