diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-06 02:12:23 +0100 |
| commit | f34a1b70eb86e4a63cfb88ea460345bb1aed88e3 (patch) | |
| tree | 32834d23912250e0c4b86aa4420baacf8091c0fe /nixpkgs/pkgs/development/libraries/qxmpp | |
| parent | 003ab91dd67b093890db1dd0bab564345db6e496 (diff) | |
| parent | 7a7cfff8915e06365bc2365ff33d4d413184fa9f (diff) | |
| download | nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.gz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.bz2 nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.lz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.xz nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.tar.zst nixlib-f34a1b70eb86e4a63cfb88ea460345bb1aed88e3.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qxmpp')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qxmpp/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qxmpp/default.nix b/nixpkgs/pkgs/development/libraries/qxmpp/default.nix index e8b1b5eef3a6..cf29b084f940 100644 --- a/nixpkgs/pkgs/development/libraries/qxmpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/qxmpp/default.nix @@ -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; { |