diff options
11 files changed, 40 insertions, 17 deletions
diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index 76c4f3f2c50..d89670d7719 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -16,10 +16,10 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtwebengine - grantlee grantleetheme + grantlee kcmutils kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison akonadi-mime kcontacts kmime libkleo ]; - propagatedBuildInputs = [ akonadi ]; + propagatedBuildInputs = [ akonadi grantleetheme ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index ff4b8fc93ed..92499645e7f 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -10,7 +10,7 @@ mkDerivation { license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; - output = [ "out" "dev" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 34f28ae7ff5..255b3828f76 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -75,7 +75,7 @@ let plasma-settings = callPackage ./plasma-settings.nix {}; plasmatube = callPackage ./plasmatube {}; qmlkonsole = callPackage ./qmlkonsole.nix {}; - spacebar = callPackage ./spacebar.nix { inherit srcs; }; + spacebar = callPackage ./spacebar.nix {}; tokodon = callPackage ./tokodon.nix {}; }; diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index c120851e5b2..659b92228d2 100644 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ b/pkgs/applications/plasma-mobile/spacebar.nix @@ -1,7 +1,5 @@ { lib , mkDerivation -, gcc12Stdenv -, srcs , cmake , extra-cmake-modules @@ -17,17 +15,14 @@ , knotifications , kpeople , libphonenumber -, libqofono , modemmanager-qt , protobuf , qcoro , qtquickcontrols2 }: -# Workaround for AArch64 still using GCC9. -gcc12Stdenv.mkDerivation rec { +mkDerivation { pname = "spacebar"; - inherit (srcs.spacebar) version src; nativeBuildInputs = [ cmake diff --git a/pkgs/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix index fd412711e4a..59169cd510c 100644 --- a/pkgs/desktops/plasma-5/kpipewire.nix +++ b/pkgs/desktops/plasma-5/kpipewire.nix @@ -19,10 +19,10 @@ mkDerivation { ki18n kcoreaddons plasma-wayland-protocols - libepoxy ffmpeg mesa pipewire wayland ]; + propagatedBuildInputs = [ libepoxy ]; } diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 56899b1f897..b115e1c8d7b 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -2,14 +2,14 @@ mkDerivation rec { pname = "grantlee"; - version = "5.2.0"; + version = "5.3.1"; grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}"; src = fetchFromGitHub { owner = "steveire"; repo = "grantlee"; rev = "v${version}"; - sha256 = "sha256-mAbgzdBdIW1wOTQNBePQuyTgkKdpn1c+zR3H7mXHvgk="; + sha256 = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY="; }; buildInputs = [ qtbase qtscript ]; diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch index 64eb11c3f15..b29911bcfcd 100644 --- a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch +++ b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch @@ -9,7 +9,7 @@ Index: grantlee-5.1.0/templates/lib/templateloader.cpp - if (file.exists() - && !fi.canonicalFilePath().contains( - QDir(d->m_templateDirs.at(i)).canonicalPath())) -- return Template(); +- return {}; ++i; } diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index f807193718d..564e3ae2537 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, fetchpatch, extra-cmake-modules, breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews, qtbase, qtsvg, qttools, @@ -9,6 +9,12 @@ mkDerivation { pname = "kiconthemes"; patches = [ ./default-theme-breeze.patch + + # fix compile error + (fetchpatch { + url = "https://invent.kde.org/frameworks/kiconthemes/-/commit/d5d04e3c3fa92fbfd95eced39c3e272b8980563d.patch"; + hash = "sha256-8YGWJg7+LrPpezW8ubObcFovI5DCVn3gbdH7KDdEeQw="; + }) ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix index fec795c5748..ec3c19fe31b 100644 --- a/pkgs/development/libraries/kirigami-addons/default.nix +++ b/pkgs/development/libraries/kirigami-addons/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "kirigami-addons"; - version = "0.6"; + version = "0.7.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RUu/0O/YRVRsRYeASfW8UQ/Ql2VbLOdVySVo9/hAmLw="; + sha256 = "sha256-2s9ShwYd2hOb18WRA2nLst6Q4UBHvFL+g7Grpjclz9I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ktextaddons/default.nix b/pkgs/development/libraries/ktextaddons/default.nix new file mode 100644 index 00000000000..b7286e7bea2 --- /dev/null +++ b/pkgs/development/libraries/ktextaddons/default.nix @@ -0,0 +1,20 @@ +{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, karchive, kconfigwidgets, kcoreaddons, ki18n, kxmlgui, qtkeychain }: +mkDerivation rec { + pname = "ktextaddons"; + version = "1.1.0"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-BV1tHCD6kGI5Zj8PRZcEanLi1O7huS+qUijjtePDvik="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ karchive kconfigwidgets kcoreaddons ki18n kxmlgui qtkeychain ]; + + meta = with lib; { + description = "Various text handling addons for KDE applications"; + homepage = "https://invent.kde.org/libraries/ktextaddons/"; + license = licenses.gpl2Plus; + maintainers = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c33c8bba222..661e8562143 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20887,6 +20887,8 @@ with pkgs; kronosnet = callPackage ../development/libraries/kronosnet { }; + ktextaddons = libsForQt5.callPackage ../development/libraries/ktextaddons {}; + l-smash = callPackage ../development/libraries/l-smash { stdenv = gccStdenv; }; |