Unverified Commit 02c0a3b5 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #310589 from K900/kf-6.2 

KDE Frameworks 6.2 + cleanups
parents a6c0d36e 9e4acec7

maintainers/scripts/kde/collect-missing-deps.py

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ OK_MISSING_BY_PACKAGE = { 
    "discover": {

        "rpm-ostree-1",  # we don't have rpm-ostree (duh)

        "Snapd",  # we don't have snaps and probably never will

        "packagekitqt6",  # intentionally disabled

    },

    "elisa": {

        "UPNPQT",  # upstream says it's broken
@@ -36,6 +37,9 @@ OK_MISSING_BY_PACKAGE = { 
        "Sphinx",  # only used for docs, bloats closure size

        "QCollectionGenerator"

    },

    "gwenview": {

        "Tiff",  # duplicate?

    },

    "kio-extras-kf5": {

        "KDSoapWSDiscoveryClient",  # actually vendored on KF5 version

    },

pkgs/kde/frameworks/kfilemetadata/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
  ebook_tools,

  exiv2,

  ffmpeg,

  kcodecs,

  kconfig,

  kdegraphics-mobipocket,

  libappimage,
@@ -18,5 +17,5 @@ mkKdeDerivation { 
  patches = [./cmake-install-paths.patch];



  extraNativeBuildInputs = [pkg-config];

  extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kcodecs kconfig kdegraphics-mobipocket libappimage];

  extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kconfig kdegraphics-mobipocket libappimage];

}

pkgs/kde/frameworks/kguiaddons/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -2,12 +2,11 @@ 
  mkKdeDerivation,

  qtwayland,

  pkg-config,

  wayland,

}:

mkKdeDerivation {

  pname = "kguiaddons";



  extraNativeBuildInputs = [pkg-config];

  extraBuildInputs = [qtwayland wayland];

  extraBuildInputs = [qtwayland];

  meta.mainProgram = "kde-geo-uri-handler";

}

pkgs/kde/frameworks/kidletime/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -2,12 +2,11 @@ 
  mkKdeDerivation,

  qtwayland,

  pkg-config,

  wayland-protocols,

  xorg,

}:

mkKdeDerivation {

  pname = "kidletime";



  extraNativeBuildInputs = [pkg-config];

  extraBuildInputs = [qtwayland xorg.libXScrnSaver wayland-protocols];

  extraBuildInputs = [qtwayland xorg.libXScrnSaver];

}

pkgs/kde/frameworks/kwindowsystem/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -4,11 +4,10 @@ 
  qtdeclarative,

  qtwayland,

  pkg-config,

  wayland,

}:

mkKdeDerivation {

  pname = "kwindowsystem";



  extraNativeBuildInputs = [qttools pkg-config];

  extraBuildInputs = [qtdeclarative qtwayland wayland];

  extraBuildInputs = [qtdeclarative qtwayland];

}