Unverified Commit 62ec68fc authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #221839 from K900/kde-cleanups 

treewide: assorted KDE-related updates and cleanups
parents 256961d4 81a72db5

pkgs/applications/kde/akonadi-contacts.nix

+2 −2
Original line number Diff line number Diff line
@@ -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" ];

}

pkgs/applications/kde/grantleetheme/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/plasma-mobile/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 {};

    };

pkgs/applications/plasma-mobile/spacebar.nix

+1 −6
Original line number Diff line number Diff line 
{ 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

pkgs/desktops/plasma-5/kpipewire.nix

+1 −1
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ mkDerivation { 
    ki18n

    kcoreaddons

    plasma-wayland-protocols

    libepoxy

    ffmpeg

    mesa

    pipewire

    wayland

  ];

  propagatedBuildInputs = [ libepoxy ];

}