diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-01 11:40:12 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-01 11:40:12 +0100 |
commit | bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86 (patch) | |
tree | 8eb035cbab19794f6415cc460fac7226f7a58afc /nixpkgs/pkgs/kde/gear/itinerary | |
parent | 66f707d69f1e423db5a35c2fe43b32781125a9af (diff) | |
parent | 09c1497ce5d4ed4a0edfdd44450d3048074cb300 (diff) | |
download | nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.gz nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.bz2 nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.lz nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.xz nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.zst nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/kde/gear/itinerary')
-rw-r--r-- | nixpkgs/pkgs/kde/gear/itinerary/default.nix | 17 | ||||
-rw-r--r-- | nixpkgs/pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch | 15 |
2 files changed, 32 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/kde/gear/itinerary/default.nix b/nixpkgs/pkgs/kde/gear/itinerary/default.nix new file mode 100644 index 000000000000..29c129132071 --- /dev/null +++ b/nixpkgs/pkgs/kde/gear/itinerary/default.nix @@ -0,0 +1,17 @@ +{ + mkKdeDerivation, + pkg-config, + qtlocation, + qtpositioning, + shared-mime-info, + libical, +}: +mkKdeDerivation { + pname = "itinerary"; + + # FIXME: this should really be fixed at ECM level somehow + patches = [./optional-runtime-dependencies.patch]; + + extraNativeBuildInputs = [pkg-config shared-mime-info]; + extraBuildInputs = [qtlocation qtpositioning libical]; +} diff --git a/nixpkgs/pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch b/nixpkgs/pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch new file mode 100644 index 000000000000..004122fab4c8 --- /dev/null +++ b/nixpkgs/pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 55ae3280..cac86220 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -85,8 +85,8 @@ ecm_find_qmlmodule(QtPositioning 6.0) + ecm_find_qmlmodule(org.kde.kitemmodels 5.245) + ecm_find_qmlmodule(org.kde.prison 5.245) + ecm_find_qmlmodule(org.kde.prison.scanner 5.245) +-ecm_find_qmlmodule(org.kde.kosmindoormap 24.02 REQUIRED) +-ecm_find_qmlmodule(org.kde.kopeninghours 24.02 REQUIRED) ++ecm_find_qmlmodule(org.kde.kosmindoormap 24.02) ++ecm_find_qmlmodule(org.kde.kopeninghours 24.02) + + # runtime dependencies are build-time dependencies on Android + if (ANDROID) |