diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-17 18:01:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-17 18:01:02 +0000 |
| commit | 6396e5680929ec6b9e88d6f1b308af5b83995183 (patch) | |
| tree | 27aff8ba54ebe5c47dc54cc65c936b0158571519 /pkgs/servers/mqtt/mosquitto | |
| parent | ec02adf37f19c5dcd891ebf9f175ebb1c4fba80a (diff) | |
| parent | 17eaac83fe050b74f8d9cc968ef69552459663d9 (diff) | |
| download | nixlib-6396e5680929ec6b9e88d6f1b308af5b83995183.tar nixlib-6396e5680929ec6b9e88d6f1b308af5b83995183.tar.gz nixlib-6396e5680929ec6b9e88d6f1b308af5b83995183.tar.bz2 nixlib-6396e5680929ec6b9e88d6f1b308af5b83995183.tar.lz nixlib-6396e5680929ec6b9e88d6f1b308af5b83995183.tar.xz nixlib-6396e5680929ec6b9e88d6f1b308af5b83995183.tar.zst nixlib-6396e5680929ec6b9e88d6f1b308af5b83995183.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/mqtt/mosquitto')
| -rw-r--r-- | pkgs/servers/mqtt/mosquitto/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index f586b606f1d2..824dcdf62f88 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -12,6 +12,7 @@ , openssl , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd +, uthash , fetchpatch , nixosTests }: @@ -52,11 +53,6 @@ stdenv.mkDerivation rec { substituteInPlace man/$f.xsl \ --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl done - - # the manpages are not generated when using cmake - pushd man - make - popd ''; outputs = [ "out" "dev" "lib" ]; @@ -70,12 +66,18 @@ stdenv.mkDerivation rec { libuv libwebsockets' openssl + uthash ] ++ lib.optional withSystemd systemd; cmakeFlags = [ - "-DWITH_THREADING=ON" - "-DWITH_WEBSOCKETS=ON" - ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON"; + (lib.cmakeBool "WITH_BUNDLED_DEPS" false) + (lib.cmakeBool "WITH_WEBSOCKETS" true) + (lib.cmakeBool "WITH_SYSTEMD" withSystemd) + ]; + + postFixup = '' + sed -i "s|^prefix=.*|prefix=$lib|g" $dev/lib/pkgconfig/*.pc + ''; passthru.tests = { inherit (nixosTests) mosquitto; |