alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #106678 from SCOTT-HAMILTON/ksmoothdock

Browse source 
ksmoothdock: qt514 -> qt515 (fix build)
This commit is contained in:
Doron Behar 2020-12-30 08:39:09 +02:00 committed by GitHub
parent 9656774860 dcab5b7d57
commit 1c090a5003
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/misc/ksmoothdock/default.nix
View file

@ -25,6 +25,11 @@ mkDerivation rec {
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 ];

2
pkgs/top-level/all-packages.nix
View file

@ -5160,7 +5160,7 @@ in
peruse = libsForQt5.callPackage ../tools/misc/peruse { };
ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { };
ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { };
kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { };