diff options
author | K900 <me@0upti.me> | 2023-03-18 01:39:35 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2023-04-20 11:53:41 +0300 |
commit | 7b52754edb79054aee841ed3cbb3835612946ee0 (patch) | |
tree | b7c99640889476e17fc4c2e441a70c1f29118794 | |
parent | eab21608dee657d15e64dbb3a965f382cccec467 (diff) | |
download | nixpkgs-7b52754edb79054aee841ed3cbb3835612946ee0.tar nixpkgs-7b52754edb79054aee841ed3cbb3835612946ee0.tar.gz nixpkgs-7b52754edb79054aee841ed3cbb3835612946ee0.tar.bz2 nixpkgs-7b52754edb79054aee841ed3cbb3835612946ee0.tar.lz nixpkgs-7b52754edb79054aee841ed3cbb3835612946ee0.tar.xz nixpkgs-7b52754edb79054aee841ed3cbb3835612946ee0.tar.zst nixpkgs-7b52754edb79054aee841ed3cbb3835612946ee0.zip |
kde/pim: create missing include directories to avoid cmake errors
This is a hack and should be removed once upstream fixes this.
27 files changed, 106 insertions, 4 deletions
diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix index 474672dfd7d..95ee121b59f 100644 --- a/pkgs/applications/kde/akonadi-calendar.nix +++ b/pkgs/applications/kde/akonadi-calendar.nix @@ -17,4 +17,8 @@ mkDerivation { kio kmailtransport ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index d89670d7719..2486019ac69 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -22,4 +22,8 @@ mkDerivation { ]; propagatedBuildInputs = [ akonadi grantleetheme ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index fbd028b1ec2..b498fde26df 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -13,4 +13,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix index 1ab0ca74819..411f71440a0 100644 --- a/pkgs/applications/kde/akonadi-notes.nix +++ b/pkgs/applications/kde/akonadi-notes.nix @@ -15,4 +15,8 @@ mkDerivation { akonadi kcompletion ki18n kitemmodels kmime kxmlgui ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix index 84657177f89..2908748e474 100644 --- a/pkgs/applications/kde/akonadi-search.nix +++ b/pkgs/applications/kde/akonadi-search.nix @@ -17,4 +17,8 @@ mkDerivation { akonadi akonadi-mime kcalendarcore kcontacts kcoreaddons kmime qtbase ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index e816d3eeb41..ade8ebbcf42 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -44,10 +44,8 @@ mkDerivation { cmakeFlags = lib.optional (defaultDriver != "MYSQL") "-DDATABASE_BACKEND=${defaultDriver}"; - # compatibility symlinks for kmymoney, can probably be removed in next kde bump postInstall = '' - ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection - ln -s $dev/include/KF5/AkonadiCore/Akonadi/ItemFetchScope $dev/include/KF5/AkonadiCore/ItemFetchScope - ln -s $dev/include/KF5/AkonadiCore/Akonadi/RecursiveItemFetchJob $dev/include/KF5/AkonadiCore/RecursiveItemFetchJob + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" ''; } diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix index c6a4e36c82d..4cc1bb1f1c6 100644 --- a/pkgs/applications/kde/calendarsupport.nix +++ b/pkgs/applications/kde/calendarsupport.nix @@ -17,4 +17,8 @@ mkDerivation { ]; propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix index 001c1e6cbcb..382f0ee48b1 100644 --- a/pkgs/applications/kde/eventviews.nix +++ b/pkgs/applications/kde/eventviews.nix @@ -17,4 +17,8 @@ mkDerivation { libkdepim qtbase qttools kholidays ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 92499645e7f..2cc532d2510 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -16,4 +16,8 @@ mkDerivation { grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase ]; propagatedBuildInputs = [ grantlee kiconthemes knewstuff ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix index 9c248f199a5..2e10c129eef 100644 --- a/pkgs/applications/kde/incidenceeditor.nix +++ b/pkgs/applications/kde/incidenceeditor.nix @@ -17,4 +17,8 @@ mkDerivation { kldap kmime pimcommon qtbase ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix index 7da9739aad1..591e28cd737 100644 --- a/pkgs/applications/kde/kcalutils.nix +++ b/pkgs/applications/kde/kcalutils.nix @@ -17,4 +17,8 @@ mkDerivation { kidentitymanagement kpimtextedit ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix index c2f2abcd32d..6316a86024b 100644 --- a/pkgs/applications/kde/kidentitymanagement.nix +++ b/pkgs/applications/kde/kidentitymanagement.nix @@ -17,4 +17,8 @@ mkDerivation { ]; propagatedBuildInputs = [ kcoreaddons kpimtextedit ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix index 8abaa171429..b910328c2ca 100644 --- a/pkgs/applications/kde/kimap.nix +++ b/pkgs/applications/kde/kimap.nix @@ -14,4 +14,8 @@ mkDerivation { buildInputs = [ ki18n kio ]; propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime kitemmodels ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix index 6016cfd090c..b7c7777a9a5 100644 --- a/pkgs/applications/kde/kldap.nix +++ b/pkgs/applications/kde/kldap.nix @@ -14,4 +14,8 @@ mkDerivation { buildInputs = [ ki18n kio kmbox libsecret qtkeychain ]; propagatedBuildInputs = [ cyrus_sasl openldap ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix index 577beb8d5ec..ab6700144a8 100644 --- a/pkgs/applications/kde/kmailtransport.nix +++ b/pkgs/applications/kde/kmailtransport.nix @@ -19,4 +19,8 @@ mkDerivation { ]; propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix index d2b4dbde8ac..9a835116c42 100644 --- a/pkgs/applications/kde/kmbox.nix +++ b/pkgs/applications/kde/kmbox.nix @@ -13,4 +13,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kmime qtbase kcodecs ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index 8dfd910eede..fe8442e9d19 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -13,4 +13,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcodecs ki18n qtbase ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix index 292a21e32c2..43e09777bdd 100644 --- a/pkgs/applications/kde/kontactinterface.nix +++ b/pkgs/applications/kde/kontactinterface.nix @@ -16,4 +16,8 @@ mkDerivation { kiconthemes kwindowsystem kxmlgui qtx11extras ]; propagatedBuildInputs = [ kparts ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$out/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index 040fbd122ef..de5afb72d1f 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -19,4 +19,8 @@ mkDerivation { ]; propagatedBuildInputs = [ ktextwidgets ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix index b088bbc4577..591426e141e 100644 --- a/pkgs/applications/kde/ksmtp/default.nix +++ b/pkgs/applications/kde/ksmtp/default.nix @@ -13,4 +13,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons kio kmime ]; propagatedBuildInputs = [ cyrus_sasl ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$out/include/KF5" + ''; } diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix index fec85644aa7..4b0e751734e 100644 --- a/pkgs/applications/kde/ktnef.nix +++ b/pkgs/applications/kde/ktnef.nix @@ -15,4 +15,8 @@ mkDerivation { kcalendarcore kcalutils kcontacts ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix index 2055d7bd36b..0335ded0065 100644 --- a/pkgs/applications/kde/libgravatar.nix +++ b/pkgs/applications/kde/libgravatar.nix @@ -15,4 +15,8 @@ mkDerivation { kconfig kio ktextwidgets kwidgetsaddons pimcommon ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix index 5fafd2e1eff..7e66a17e5dc 100644 --- a/pkgs/applications/kde/libkdepim.nix +++ b/pkgs/applications/kde/libkdepim.nix @@ -18,4 +18,8 @@ mkDerivation { kconfigwidgets kcontacts ki18n kiconthemes kio kitemviews kjobwidgets kldap kwallet ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$out/include/KF5" + ''; } diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix index 0cd858ea6e0..32369495aef 100644 --- a/pkgs/applications/kde/libkleo.nix +++ b/pkgs/applications/kde/libkleo.nix @@ -18,4 +18,8 @@ mkDerivation { ]; propagatedBuildInputs = [ qgpgme ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix index af29ff41681..d9885058ef8 100644 --- a/pkgs/applications/kde/mailcommon.nix +++ b/pkgs/applications/kde/mailcommon.nix @@ -19,4 +19,8 @@ mkDerivation { kwindowsystem mailimporter messagelib phonon libkdepim ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix index 745316fbaf9..08503ba9e83 100644 --- a/pkgs/applications/kde/mailimporter.nix +++ b/pkgs/applications/kde/mailimporter.nix @@ -16,4 +16,8 @@ mkDerivation { akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime kxmlgui libkdepim pimcommon ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$out/include/KF5" + ''; } diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index d52989d3ffc..abd9382a1f0 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -26,4 +26,8 @@ mkDerivation { qtwebengine ]; outputs = [ "out" "dev" ]; + postInstall = '' + # added as an include directory by cmake files and fails to compile if it's missing + mkdir -p "$dev/include/KF5" + ''; } |