Merge pull request #111325 from ttuegel/kde-frameworks-5.78
KDE Frameworks 5.78
This commit is contained in:
commit
1814894c33
@ -1 +1 @@
|
|||||||
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.76/ -A '*.tar.xz' )
|
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.78/ -A '*.tar.xz' )
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
mkDerivation, lib,
|
mkDerivation, lib, fetchpatch,
|
||||||
extra-cmake-modules,
|
extra-cmake-modules,
|
||||||
kconfig, kwidgetsaddons, qtbase, qttools
|
kconfig, kwidgetsaddons, qtbase, qttools
|
||||||
}:
|
}:
|
||||||
@ -7,6 +7,13 @@
|
|||||||
mkDerivation {
|
mkDerivation {
|
||||||
name = "kcompletion";
|
name = "kcompletion";
|
||||||
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
|
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
|
||||||
|
patches = [
|
||||||
|
# https://mail.kde.org/pipermail/distributions/2021-January/000928.html
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://invent.kde.org/frameworks/kcompletion/commit/7acda936f06193e9fc85ae5cf9ccc8d65971f657.patch";
|
||||||
|
sha256 = "150ff506rhr5pin5363ks222vhv8qd77y5s5nyylcbdjry3ljd3n";
|
||||||
|
})
|
||||||
|
];
|
||||||
nativeBuildInputs = [ extra-cmake-modules ];
|
nativeBuildInputs = [ extra-cmake-modules ];
|
||||||
buildInputs = [ kconfig kwidgetsaddons qttools ];
|
buildInputs = [ kconfig kwidgetsaddons qttools ];
|
||||||
propagatedBuildInputs = [ qtbase ];
|
propagatedBuildInputs = [ qtbase ];
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
mkDerivation, lib,
|
mkDerivation, lib,
|
||||||
extra-cmake-modules,
|
extra-cmake-modules,
|
||||||
qtbase, qtx11extras,
|
qtbase, qtx11extras, wayland,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
@ -11,7 +11,7 @@ mkDerivation {
|
|||||||
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
|
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
|
||||||
};
|
};
|
||||||
nativeBuildInputs = [ extra-cmake-modules ];
|
nativeBuildInputs = [ extra-cmake-modules ];
|
||||||
buildInputs = [ qtx11extras ];
|
buildInputs = [ qtx11extras wayland ];
|
||||||
propagatedBuildInputs = [ qtbase ];
|
propagatedBuildInputs = [ qtbase ];
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
mkDerivation, lib,
|
mkDerivation, lib, fetchpatch,
|
||||||
extra-cmake-modules, kdoctools, qttools,
|
extra-cmake-modules, kdoctools, qttools,
|
||||||
karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
|
karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
|
||||||
kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
|
kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
|
||||||
@ -24,5 +24,10 @@ mkDerivation {
|
|||||||
patches = [
|
patches = [
|
||||||
./samba-search-path.patch
|
./samba-search-path.patch
|
||||||
./kio-debug-module-loader.patch
|
./kio-debug-module-loader.patch
|
||||||
|
# https://mail.kde.org/pipermail/distributions/2021-February/000938.html
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://invent.kde.org/frameworks/kio/commit/a183dd0d1ee0659e5341c7cb4117df27edd6f125.patch";
|
||||||
|
sha256 = "1msnzi93zggxgarx962gnlz1slx13nc3l54wib3rdlj0xnnlfdnd";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user