public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93195 from ttuegel/krunner-deprecated-crash

Browse Source 
krunner: add upstream patch for deprecated virtual method
This commit is contained in:
Thomas Tuegel 2020-07-17 08:19:02 -05:00 committed by GitHub
commit daa6298c96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/kde-frameworks/default.nix
View File

@ -83,7 +83,7 @@ let
in mkDerivation (args // { in mkDerivation (args // {
name = "${name}-${version}"; name = "${name}-${version}";
inherit meta outputs setupHook src; inherit meta outputs setupHook src version;
}); });
}; };

31
pkgs/development/libraries/kde-frameworks/krunner.nix
View File

@ -1,17 +1,26 @@
{ {
mkDerivation, lib, mkDerivation, lib, fetchpatch,
extra-cmake-modules, extra-cmake-modules,
kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase, kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase,
qtdeclarative, solid, threadweaver, kwindowsystem qtdeclarative, solid, threadweaver, kwindowsystem
}: }:
mkDerivation { let
name = "krunner"; self = mkDerivation {
meta = { maintainers = [ lib.maintainers.ttuegel ]; }; name = "krunner";
nativeBuildInputs = [ extra-cmake-modules ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; };
buildInputs = [ patches = [
kconfig kcoreaddons ki18n kio kservice qtdeclarative solid # Un-deprecate virtual method to restore binary compatibility.
threadweaver (assert !(lib.versionOlder "5.72" self.version); fetchpatch {
]; url = "https://invent.kde.org/frameworks/krunner/-/commit/8f7ce559b84ee0c21de0256e6591793e4b95f411.diff";
propagatedBuildInputs = [ plasma-framework qtbase kwindowsystem ]; sha256 = "06h9g04syv6x3hqi0iy9wll78yf9ys95r5vm104sc25pnszvjbxv";
} })
];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcoreaddons ki18n kio kservice qtdeclarative solid
threadweaver
];
propagatedBuildInputs = [ plasma-framework qtbase kwindowsystem ];
};
in self