Commit f6d4c312 authored by K900's avatar K900
Browse files

treewide: clean up ecm_find_qmlmodule hacks

parent beb319d3

pkgs/by-name/ea/easyeffects/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-Tz14pjI5pNJOQH0KFaf9mJkFdup1GVxlkMnzVQusx/M=";

  };



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



  nativeBuildInputs = [

    cmake

    extra-cmake-modules

pkgs/by-name/ea/easyeffects/qmlmodule-fix.patch

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 2736ac18b..85be09a90 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -65,7 +65,7 @@ find_package(KF${QT_MAJOR_VERSION} REQUIRED COMPONENTS

     QQC2DesktopStyle

 )

 

-ecm_find_qmlmodule(org.kde.kirigami REQUIRED)

+ecm_find_qmlmodule(org.kde.kirigami)

 

 qt_policy(SET QTP0001 NEW)

pkgs/by-name/ko/kontainer/package.nix

+0 −5
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-15H4fTZ4Tja+nt0iKtFuULj/4g/0UK+W79R4kH7BFcs=";

  };



  postPatch = ''

    substituteInPlace CMakeLists.txt \

      --replace-fail "ecm_find_qmlmodule(org.kde.kirigami REQUIRED)" "ecm_find_qmlmodule(org.kde.kirigami)"

  '';



  nativeBuildInputs = [

    cmake

    ninja

pkgs/kde/gear/itinerary/default.nix

+0 −3
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 
mkKdeDerivation {

  pname = "itinerary";



  # FIXME: this should really be fixed at ECM level somehow

  patches = [ ./optional-runtime-dependencies.patch ];



  extraNativeBuildInputs = [

    pkg-config

    shared-mime-info

pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -80,8 +80,8 @@ ecm_find_qmlmodule(QtPositioning 6.0)

 ecm_find_qmlmodule(org.kde.kitemmodels ${KF_MIN_VERSION})

 ecm_find_qmlmodule(org.kde.prison ${KF_MIN_VERSION})

 ecm_find_qmlmodule(org.kde.prison.scanner ${KF_MIN_VERSION})

-ecm_find_qmlmodule(org.kde.kosmindoormap ${GEAR_MIN_VERSION} REQUIRED)

-ecm_find_qmlmodule(org.kde.kopeninghours ${GEAR_MIN_VERSION} REQUIRED)

+ecm_find_qmlmodule(org.kde.kosmindoormap ${GEAR_MIN_VERSION})

+ecm_find_qmlmodule(org.kde.kopeninghours ${GEAR_MIN_VERSION})

 

 # runtime dependencies are build-time dependencies on Android

 if (ANDROID)