swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #274823 from astro/kaidan

Browse source 
kaidan: 0.8.0 -> 0.9.1
This commit is contained in:
Weijia Wang 2024-01-03 02:27:20 +01:00 committed by GitHub
parent d2c0f33faf cc6798be15
commit 9c703e113f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/networking/instant-messengers/kaidan/default.nix
View file

@ -8,8 +8,11 @@
, qtmultimedia , qtmultimedia
, qtlocation , qtlocation
, qqc2-desktop-style , qqc2-desktop-style
, kirigami-addons
, kirigami2 , kirigami2
, kio
, knotifications , knotifications
, kquickimageedit
, zxing-cpp , zxing-cpp
, qxmpp , qxmpp
, sonnet , sonnet
@ -18,14 +21,14 @@
mkDerivation rec { mkDerivation rec {
pname = "kaidan"; pname = "kaidan";
version = "0.8.0"; version = "0.9.1";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "invent.kde.org"; domain = "invent.kde.org";
owner = "network"; owner = "network";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "070njci5zyzahmz3nqyp660chxnqx1mxp31w17syfllvrw403qmg"; hash = "sha256-F5GhN9hAF2e8b0T3peUnLk8CVd+nq4YR8k52x6ZOoLM=";
}; };
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
@ -35,8 +38,11 @@ mkDerivation rec {
qtmultimedia qtmultimedia
qtlocation qtlocation
qqc2-desktop-style qqc2-desktop-style
kirigami-addons
kirigami2 kirigami2
kio
knotifications knotifications
kquickimageedit
zxing-cpp zxing-cpp
qxmpp qxmpp
sonnet sonnet

29
pkgs/by-name/li/libomemo-c/package.nix Normal file
View file

@ -0,0 +1,29 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, openssl
}:
stdenv.mkDerivation rec {
pname = "libomemo-c";
version = "0.5.0";
src = fetchFromGitHub {
owner = "dino";
repo = "libomemo-c";
rev = "v${version}";
hash = "sha256-GvHMp0FWoApbYLMhKfNxSBel1xxWWF3TZ4lnkLvu2s4=";
};
nativeBuildInputs = [ cmake ];
buildsInputs = [ openssl ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
meta = with lib; {
description = "Fork of libsignal-protocol-c adding support for OMEMO XEP-0384 0.5.0+";
homepage = "https://github.com/dino/libomemo-c";
license = licenses.gpl3Only;
maintainers = [ maintainers.astro ];
};
}

12
pkgs/development/libraries/qxmpp/default.nix
View file

@ -5,6 +5,9 @@
, pkg-config , pkg-config
, withGstreamer ? true , withGstreamer ? true
, gst_all_1 , gst_all_1
, withOmemo ? true
, qca-qt5
, libomemo-c
}: }:
mkDerivation rec { mkDerivation rec {
@ -20,7 +23,7 @@ mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
] ++ lib.optionals withGstreamer [ ] ++ lib.optionals (withGstreamer || withOmemo) [
pkg-config pkg-config
]; ];
buildInputs = lib.optionals withGstreamer (with gst_all_1; [ buildInputs = lib.optionals withGstreamer (with gst_all_1; [
@ -28,12 +31,17 @@ mkDerivation rec {
gst-plugins-bad gst-plugins-bad
gst-plugins-base gst-plugins-base
gst-plugins-good gst-plugins-good
]); ]) ++ lib.optionals withOmemo [
qca-qt5
libomemo-c
];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_EXAMPLES=false" "-DBUILD_EXAMPLES=false"
"-DBUILD_TESTS=false" "-DBUILD_TESTS=false"
] ++ lib.optionals withGstreamer [ ] ++ lib.optionals withGstreamer [
"-DWITH_GSTREAMER=ON" "-DWITH_GSTREAMER=ON"
] ++ lib.optionals withOmemo [
"-DBUILD_OMEMO=ON"
]; ];
meta = with lib; { meta = with lib; {