Merge pull request #259436 from SuperSandro2000/itinerary

This commit is contained in:
Thomas Tuegel 2023-10-15 07:02:16 -05:00 committed by GitHub
commit 316ef085cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 133 additions and 5 deletions

View File

@ -94,6 +94,7 @@ let
grantleetheme = callPackage ./grantleetheme {};
gwenview = callPackage ./gwenview.nix {};
incidenceeditor = callPackage ./incidenceeditor.nix {};
itinerary = callPackage ./itinerary.nix {};
juk = callPackage ./juk.nix {};
k3b = callPackage ./k3b.nix {};
kaccounts-integration = callPackage ./kaccounts-integration.nix {};
@ -179,7 +180,9 @@ let
kontact = callPackage ./kontact.nix {};
konversation = callPackage ./konversation.nix {};
kontactinterface = callPackage ./kontactinterface.nix {};
kopeninghours = callPackage ./kopeninghours.nix {};
korganizer = callPackage ./korganizer.nix {};
kosmindoormap = callPackage ./kosmindoormap.nix {};
kpat = callPackage ./kpat.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
kpkpass = callPackage ./kpkpass.nix {};

View File

@ -0,0 +1,62 @@
{ mkDerivation
, lib
, extra-cmake-modules
, karchive
, kcalendarcore
, kcontacts
, kdbusaddons
, kfilemetadata
, kholidays
, kio
, kirigami-addons
, kitemmodels
, kitinerary
, kmime
, knotifications
, kosmindoormap
, kpkpass
, kpublictransport
, kunitconversion
, libquotient
, networkmanager-qt
, qqc2-desktop-style
, qtpositioning
, qtquickcontrols2
, shared-mime-info
}:
mkDerivation {
pname = "itinerary";
outputs = [ "out" "dev" ];
nativeBuildInputs = [
extra-cmake-modules
shared-mime-info # for update-mime-database
];
buildInputs = [
karchive
kcalendarcore
kcontacts
kdbusaddons
kfilemetadata
kholidays
kio
kirigami-addons
kitemmodels
kitinerary
kmime
knotifications
kosmindoormap
kpkpass
kpublictransport
kunitconversion
libquotient
networkmanager-qt
qqc2-desktop-style
qtpositioning
qtquickcontrols2
];
meta.license = with lib.licenses; [ asl20 bsd3 cc0 lgpl2Plus ];
}

View File

@ -0,0 +1,28 @@
{ mkDerivation
, lib
, bison
, extra-cmake-modules
, flex
, kholidays
, ki18n
}:
mkDerivation {
pname = "kopeninghours";
outputs = [ "out" "dev" ];
nativeBuildInputs = [
bison
extra-cmake-modules
flex
];
buildInputs = [
kholidays
ki18n
];
meta = {
license = with lib.licenses; [ bsd3 cc0 lgpl2Plus ];
};
}

View File

@ -0,0 +1,30 @@
{ mkDerivation
, lib
, bison
, extra-cmake-modules
, flex
, ki18n
, kopeninghours
, kpublictransport
}:
mkDerivation {
pname = "kosmindoormap";
outputs = [ "out" "dev" ];
nativeBuildInputs = [
bison
extra-cmake-modules
flex
];
buildInputs = [
ki18n
kopeninghours
kpublictransport
];
meta = {
license = with lib.licenses; [ bsd2 bsd3 cc0 lgpl2Plus lgpl3Plus mit odbl ];
};
}

View File

@ -24,7 +24,6 @@
, qcoro
, qqc2-desktop-style
, qtgraphicaleffects
, qtkeychain
, qtlocation
, qtmultimedia
, qtquickcontrols2
@ -59,7 +58,6 @@ mkDerivation {
olm
qcoro
qtgraphicaleffects
qtkeychain
qtlocation
qtmultimedia
qtquickcontrols2

View File

@ -4,6 +4,8 @@ stdenv.mkDerivation rec {
pname = "libquotient";
version = "0.8.1.2";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "quotient-im";
repo = "libQuotient";
@ -11,10 +13,10 @@ stdenv.mkDerivation rec {
hash = "sha256-qJTikc42sFUlb4g0sAEg6v9d4k1lhbn3MZPvghm56E8=";
};
buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ];
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ qtbase qtkeychain olm openssl qtmultimedia ];
cmakeFlags = [
"-DQuotient_ENABLE_E2EE=ON"
];
@ -28,9 +30,14 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
postInstall = ''
# causes cyclic dependency but is not used
rm $out/share/ndk-modules/Android.mk
'';
meta = with lib; {
description = "A Qt5/Qt6 library to write cross-platform clients for Matrix";
homepage = "https://matrix.org/docs/projects/sdk/quotient";
homepage = "https://quotient-im.github.io/libQuotient/";
license = licenses.lgpl21;
maintainers = with maintainers; [ colemickens matthiasbeyer ];
};