mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
commit
9c703e113f
|
@ -8,8 +8,11 @@
|
|||
, qtmultimedia
|
||||
, qtlocation
|
||||
, qqc2-desktop-style
|
||||
, kirigami-addons
|
||||
, kirigami2
|
||||
, kio
|
||||
, knotifications
|
||||
, kquickimageedit
|
||||
, zxing-cpp
|
||||
, qxmpp
|
||||
, sonnet
|
||||
|
@ -18,14 +21,14 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kaidan";
|
||||
version = "0.8.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "network";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "070njci5zyzahmz3nqyp660chxnqx1mxp31w17syfllvrw403qmg";
|
||||
hash = "sha256-F5GhN9hAF2e8b0T3peUnLk8CVd+nq4YR8k52x6ZOoLM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
|
||||
|
@ -35,8 +38,11 @@ mkDerivation rec {
|
|||
qtmultimedia
|
||||
qtlocation
|
||||
qqc2-desktop-style
|
||||
kirigami-addons
|
||||
kirigami2
|
||||
kio
|
||||
knotifications
|
||||
kquickimageedit
|
||||
zxing-cpp
|
||||
qxmpp
|
||||
sonnet
|
||||
|
|
29
pkgs/by-name/li/libomemo-c/package.nix
Normal file
29
pkgs/by-name/li/libomemo-c/package.nix
Normal 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 ];
|
||||
};
|
||||
}
|
|
@ -5,6 +5,9 @@
|
|||
, pkg-config
|
||||
, withGstreamer ? true
|
||||
, gst_all_1
|
||||
, withOmemo ? true
|
||||
, qca-qt5
|
||||
, libomemo-c
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
@ -20,7 +23,7 @@ mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optionals withGstreamer [
|
||||
] ++ lib.optionals (withGstreamer || withOmemo) [
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = lib.optionals withGstreamer (with gst_all_1; [
|
||||
|
@ -28,12 +31,17 @@ mkDerivation rec {
|
|||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
]) ++ lib.optionals withOmemo [
|
||||
qca-qt5
|
||||
libomemo-c
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DBUILD_EXAMPLES=false"
|
||||
"-DBUILD_TESTS=false"
|
||||
] ++ lib.optionals withGstreamer [
|
||||
"-DWITH_GSTREAMER=ON"
|
||||
] ++ lib.optionals withOmemo [
|
||||
"-DBUILD_OMEMO=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
Loading…
Reference in a new issue