diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2020-07-15 13:54:44 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2020-07-15 13:54:44 -0500 |
commit | ee036bc025db2bf1485908929024de23453728e1 (patch) | |
tree | 088a1b317448b597bcd874c97b55873f6dfa91fe /pkgs/development/libraries | |
parent | f0d158fd886a4551e9ed6323d1ed7435c05bbbbb (diff) | |
download | nixpkgs-ee036bc025db2bf1485908929024de23453728e1.tar nixpkgs-ee036bc025db2bf1485908929024de23453728e1.tar.gz nixpkgs-ee036bc025db2bf1485908929024de23453728e1.tar.bz2 nixpkgs-ee036bc025db2bf1485908929024de23453728e1.tar.lz nixpkgs-ee036bc025db2bf1485908929024de23453728e1.tar.xz nixpkgs-ee036bc025db2bf1485908929024de23453728e1.tar.zst nixpkgs-ee036bc025db2bf1485908929024de23453728e1.zip |
krunner: upstream patch for deprecated virtual method
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/krunner.nix | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index 826999f2f9b..afea827aeb8 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,17 +1,26 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase, qtdeclarative, solid, threadweaver, kwindowsystem }: -mkDerivation { - name = "krunner"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig kcoreaddons ki18n kio kservice qtdeclarative solid - threadweaver - ]; - propagatedBuildInputs = [ plasma-framework qtbase kwindowsystem ]; -} +let + self = mkDerivation { + name = "krunner"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + patches = [ + # Un-deprecate virtual method to restore binary compatibility. + (assert !(lib.versionOlder "5.72" self.version); fetchpatch { + url = "https://invent.kde.org/frameworks/krunner/-/commit/8f7ce559b84ee0c21de0256e6591793e4b95f411.diff"; + sha256 = "06h9g04syv6x3hqi0iy9wll78yf9ys95r5vm104sc25pnszvjbxv"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kconfig kcoreaddons ki18n kio kservice qtdeclarative solid + threadweaver + ]; + propagatedBuildInputs = [ plasma-framework qtbase kwindowsystem ]; + }; +in self |