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

kdePackages: unpropagate qttools (#418164)

parents a52971ae dc7662a0

pkgs/by-name/di/digikam/package.nix

+0 −5
Original line number Diff line number Diff line
@@ -94,11 +94,6 @@ stdenv.mkDerivation (finalAttrs: { 
    bison

    kdePackages.wrapQtAppsHook

    wrapGAppsHook3



    kdePackages.qtmultimedia

    kdePackages.qtnetworkauth

    kdePackages.qtscxml

    kdePackages.qtwebengine

  ];



  # Based on <https://www.digikam.org/api/index.html#externaldeps>,

pkgs/by-name/sn/snx-rs/package.nix

+0 −22
Original line number Diff line number Diff line
@@ -2,19 +2,11 @@ 
  fetchFromGitHub,

  glib,

  gtk4,

  iproute2,

  kdePackages,

  lib,

  libappindicator,

  libappindicator-gtk2,

  libappindicator-gtk3,

  libayatana-appindicator,

  libsoup_3,

  openssl,

  pkg-config,

  qt6,

  rustPlatform,

  webkitgtk_4_1,

  wrapGAppsHook4,

  graphene,

  nix-update-script,
@@ -34,9 +26,7 @@ rustPlatform.buildRustPackage rec { 
  passthru.updateScript = nix-update-script { };



  nativeBuildInputs = [

    iproute2

    pkg-config

    qt6.wrapQtAppsHook

    wrapGAppsHook4

  ];
@@ -44,13 +34,7 @@ rustPlatform.buildRustPackage rec { 
    glib

    gtk4

    kdePackages.kstatusnotifieritem

    libappindicator

    libappindicator-gtk2

    libappindicator-gtk3

    libayatana-appindicator

    libsoup_3

    openssl

    webkitgtk_4_1

    graphene

  ];
@@ -70,12 +54,6 @@ rustPlatform.buildRustPackage rec { 
  versionCheckProgram = "${placeholder "out"}/bin/snx-rs";

  versionCheckProgramArg = "--version";



  preFixup = ''

    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")

  '';



  dontWrapGApps = true;



  meta = {

    description = "Open source Linux client for Checkpoint VPN tunnels";

    homepage = "https://github.com/ancwrd1/snx-rs";

pkgs/kde/frameworks/extra-cmake-modules/default.nix

+6 −6
Original line number Diff line number Diff line 
{

  mkKdeDerivation,

  python3,

  qttools,

}:

mkKdeDerivation {

  pname = "extra-cmake-modules";



  # Don't depend on qdoc (leaks everywhere, causes random cross issues), we don't install the docs anyway

  # Upstream PR: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/534

  patches = [ ./no-qdoc.patch ];



  outputs = [ "out" ];



  propagatedNativeBuildInputs = [

  # Packages that have an Android APK (e.g. KWeather) require Python3 at build time.

  # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57

  propagatedNativeBuildInputs = [

    python3



    # Most packages require QDoc to generate docs, even if they're not installed

    (qttools.override { withClang = true; })

  ];



  setupHook = ./ecm-hook.sh;

pkgs/kde/frameworks/extra-cmake-modules/no-qdoc.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
diff --git a/modules/ECMGenerateQDoc.cmake b/modules/ECMGenerateQDoc.cmake

index b6d64783314de790a5444c3c0d125b8e455883d9..68c570506fdc118ddef6249bce78051569298b4c 100644

--- a/modules/ECMGenerateQDoc.cmake

+++ b/modules/ECMGenerateQDoc.cmake

@@ -55,8 +55,13 @@ add_custom_target(generate_qch)

 add_custom_target(install_qch_docs)

 

 function(ecm_generate_qdoc target qdocconf_file)

-    find_package(Qt6Tools CONFIG REQUIRED)

-    find_package(Qt6 COMPONENTS ToolsTools CONFIG REQUIRED)

+    find_package(Qt6Tools CONFIG QUIET)

+    find_package(Qt6 OPTIONAL_COMPONENTS ToolsTools CONFIG QUIET)

+

+    if (NOT Qt6Tools_FOUND OR NOT Qt6ToolsTools_FOUND)

+        message(STATUS "Qt6Tools or Qt6ToolsTools not found, not generating API documentation")

+        return()

+    endif()

 

     if (NOT TARGET ${target})

         message(FATAL_ERROR "${target} is not a target")

pkgs/kde/frameworks/karchive/default.nix

+5 −1
Original line number Diff line number Diff line 
{

  mkKdeDerivation,

  qttools,

  pkg-config,

  xz,

}:

mkKdeDerivation {

  pname = "karchive";



  extraNativeBuildInputs = [ pkg-config ];

  extraNativeBuildInputs = [

    qttools

    pkg-config

  ];

  extraBuildInputs = [ xz ];

}