Merge pull request #327449 from K900/kde-backports

kdePackages: two small backports
This commit is contained in:
K900
2024-07-15 23:09:27 +03:00
committed by GitHub
2 changed files with 18 additions and 0 deletions
+8
View File
@@ -1,5 +1,6 @@
{
mkKdeDerivation,
fetchpatch,
qt5compat,
qttools,
acl,
@@ -11,6 +12,13 @@ mkKdeDerivation {
patches = [
# Remove hardcoded smbd search path
./0001-Remove-impure-smbd-search-path.patch
# Backport fix for drag and drop
# FIXME: remove in next update
(fetchpatch {
url = "https://invent.kde.org/frameworks/kio/-/commit/e0ea91afdf0dccef7e3afbf23a159bf5a8d6b249.patch";
hash = "sha256-YtklZr4DwV8wNABIAUm969w90hi4iEk5aW7a3n6yQeM=";
})
];
extraBuildInputs = [qt5compat qttools acl attr];
+10
View File
@@ -1,11 +1,21 @@
{
mkKdeDerivation,
fetchpatch,
libarchive,
libzip,
}:
mkKdeDerivation {
pname = "ark";
# Backport fix to clean up temporary folders with Qt 6.7
# FIXME: remove in next update
patches = [
(fetchpatch {
url = "https://invent.kde.org/utilities/ark/-/commit/85c5e26f581cf011638a53e62b92e1da8fd55fcd.patch";
hash = "sha256-ZjVdKgFoGE0Jme8JhGVn7+PODJqdwHQhglrHzsxePf8=";
})
];
extraBuildInputs = [libarchive libzip];
meta.mainProgram = "ark";
}