summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2023-10-06 21:18:36 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2023-10-06 21:18:36 +0200
commitde570b1bb77617525ca0d5995e0d0c22dab15dc6 (patch)
tree7b0f27f3a4417e3352b4d0531cd77563b6860299
parent6ef9b308ef1d0f9b8dbcd8ea9839945ee33794cf (diff)
downloadnixpkgs-de570b1bb77617525ca0d5995e0d0c22dab15dc6.tar
nixpkgs-de570b1bb77617525ca0d5995e0d0c22dab15dc6.tar.gz
nixpkgs-de570b1bb77617525ca0d5995e0d0c22dab15dc6.tar.bz2
nixpkgs-de570b1bb77617525ca0d5995e0d0c22dab15dc6.tar.lz
nixpkgs-de570b1bb77617525ca0d5995e0d0c22dab15dc6.tar.xz
nixpkgs-de570b1bb77617525ca0d5995e0d0c22dab15dc6.tar.zst
nixpkgs-de570b1bb77617525ca0d5995e0d0c22dab15dc6.zip
libquotient: propagate required libraries, split dev output, update meta.homepage
-rw-r--r--pkgs/development/libraries/libquotient/default.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix
index 2dd4cc6663a..e154ab8eafe 100644
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@@ -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 ];
   };