Skip to content

Commit

Permalink
krunner: upstream patch for deprecated virtual method
Browse files Browse the repository at this point in the history
  • Loading branch information
ttuegel committed Jul 15, 2020
1 parent f0d158f commit ee036bc
Showing 1 changed file with 20 additions and 11 deletions.
31 changes: 20 additions & 11 deletions pkgs/development/libraries/kde-frameworks/krunner.nix
Original file line number Diff line number Diff line change
@@ -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

3 comments on commit ee036bc

@vcunat
Copy link
Member

@vcunat vcunat commented on ee036bc Jul 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: a5cc7d3

@ttuegel
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcunat How does one correctly pre-fetch a patch?

@vcunat
Copy link
Member

@vcunat vcunat commented on ee036bc Jul 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In future Nix release you would omit the hash and Nix would tell you the hash. That should work for any fixed-output derviation, I think.

I think the usual practice today is to copy&paste some hash and do a random change in it – and run Nix. As noted on the thread, that's not ideal due to not verifying TLS certs.

Please sign in to comment.