Commit 618789b2 authored by K900's avatar K900
Browse files

kdePackages.extra-cmake-modules: propagate qdoc by default 

A lot of things hard-require the ECM bits that use it now.

Due to some cursed interaction between Qt's use of cmake and our
strictDeps patch, this makes a bunch of builds fall over until
things are moved (or, in some cases, copied) to nativeBuildInputs.

Disabling strictDeps makes things build, but starts leaking build-deps
into the final outputs via the ecm-hook wrapper, so just ADD ALL THE THINGS
for now, and hopefully we can figure out how to do this properly later.
parent e724d062

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

+5 −0
Original line number Diff line number Diff line
@@ -94,6 +94,11 @@ 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/kde/frameworks/extra-cmake-modules/default.nix

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

  mkKdeDerivation,

  python3,

  qttools,

}:

mkKdeDerivation {

  pname = "extra-cmake-modules";



  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/karchive/default.nix

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

  mkKdeDerivation,

  qttools,

  pkg-config,

  xz,

}:

mkKdeDerivation {

  pname = "karchive";



  extraNativeBuildInputs = [

    qttools

    pkg-config

  ];

  extraNativeBuildInputs = [ pkg-config ];

  extraBuildInputs = [ xz ];

}

pkgs/kde/frameworks/kauth/default.nix

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

  mkKdeDerivation,

  qttools,

}:

{ mkKdeDerivation }:

mkKdeDerivation {

  pname = "kauth";



  # Late resolve paths so things end up in their own prefix

  # FIXME(later): discuss with upstream

  patches = [ ./fix-paths.patch ];



  extraNativeBuildInputs = [ qttools ];

}

pkgs/kde/frameworks/kbookmarks/default.nix

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

  mkKdeDerivation,

  qttools,

}:

{ mkKdeDerivation }:

mkKdeDerivation {

  pname = "kbookmarks";



  extraNativeBuildInputs = [ qttools ];

}