gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: clean up ecm_find_qmlmodule hacks

Browse Source
This commit is contained in:
K900
2026-03-14 10:36:14 +03:00
parent beb319d36d
commit f6d4c312d1
13 changed files with 0 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ea/easyeffects/package.nix
-2
View File
@@ -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
-12
View File
@@ -1,12 +0,0 @@
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
-5
View File
@@ -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
-3
View File
@@ -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
-13
View File
@@ -1,13 +0,0 @@
--- 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)
pkgs/kde/gear/keysmith/default.nix
-4
View File
@@ -7,10 +7,6 @@
mkKdeDerivation {
pname = "keysmith";
patches = [
./optional-runtime-dependencies.patch
];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
qtsvg
pkgs/kde/gear/keysmith/optional-runtime-dependencies.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55ce9e0..86af3e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ find_package(KF6CoreAddons ${KF_MIN_VERSION} REQUIRED)
find_package(KF6I18n ${KF_MIN_VERSION} REQUIRED)
find_package(KF6Config ${KF_MIN_VERSION} REQUIRED)
-ecm_find_qmlmodule(org.kde.prison.scanner REQUIRED)
+ecm_find_qmlmodule(org.kde.prison.scanner)
ecm_set_disabled_deprecation_versions(QT 6.0.0
KF 6.12.0
pkgs/kde/gear/koko/default.nix
-4
View File
@@ -33,10 +33,6 @@ mkKdeDerivation {
ln -s ${cities1000} src/cities1000.zip
'';
patches = [
./optional-runtime-dependencies.patch
];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
qtmultimedia
pkgs/kde/gear/koko/optional-runtime-dependencies.patch
-13
View File
@@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,8 +76,8 @@ set_package_properties(KF6Kirigami PROPERTIES
TYPE RUNTIME
)
-ecm_find_qmlmodule(org.kde.kirigamiaddons.formcard REQUIRED)
-ecm_find_qmlmodule(org.kde.kirigamiaddons.delegates REQUIRED)
+ecm_find_qmlmodule(org.kde.kirigamiaddons.formcard)
+ecm_find_qmlmodule(org.kde.kirigamiaddons.delegates)
find_package(KF6KirigamiAddons)
set_package_properties(KF6KirigamiAddons PROPERTIES
pkgs/kde/plasma/discover/default.nix
-6
View File
@@ -9,12 +9,6 @@
mkKdeDerivation {
pname = "discover";
patches = [
# remove forced QML dependency check
# FIXME: fix the check in ECM instead
./qml-deps.patch
];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
qtwebview
pkgs/kde/plasma/discover/qml-deps.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04523c97d..945ba6a41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ find_package(QCoro6 REQUIRED COMPONENTS Core)
qcoro_enable_coroutines()
-ecm_find_qmlmodule(org.kde.kitemmodels 1.0 REQUIRED)
+ecm_find_qmlmodule(org.kde.kitemmodels 1.0)
list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "DISCOVER_BACKEND_PLUGIN")
pkgs/kde/plasma/plasma-setup/default.nix
-2
View File
@@ -7,8 +7,6 @@
mkKdeDerivation {
pname = "plasma-setup";
patches = [ ./optional-dependencies.patch ];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
qtlocation
pkgs/kde/plasma/plasma-setup/optional-dependencies.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/modules/keyboard/CMakeLists.txt b/modules/keyboard/CMakeLists.txt
index ddd52df8bc1cc1c6c3bc6b90d9b7f913092995a2..4a108baf60dcf0a87ad9e512f63884dba4442c10 100644
--- a/modules/keyboard/CMakeLists.txt
+++ b/modules/keyboard/CMakeLists.txt
@@ -9,7 +9,7 @@ ecm_qt_declare_logging_category(logging_SRCS
EXPORT PLASMASETUP
)
-ecm_find_qmlmodule(org.kde.plasma.private.kcm_keyboard REQUIRED)
+ecm_find_qmlmodule(org.kde.plasma.private.kcm_keyboard)
ecm_add_qml_module(plasmasetup_keyboard
URI "org.kde.plasmasetup.keyboard"