Merge pull request #320563 from sikmir/paho-mqtt-cpp

paho-mqtt-cpp: 1.3.2 → 1.4.0
This commit is contained in:
Nikolay Korotkiy 2024-06-26 21:58:07 +04:00 committed by GitHub
commit 35a1ac9244
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 9 deletions

View File

@ -1,19 +1,31 @@
{ lib, stdenv, fetchFromGitHub, cmake, openssl, paho-mqtt-c, enableStatic ? stdenv.hostPlatform.isStatic, enableShared ? !stdenv.hostPlatform.isStatic }:
{
lib,
stdenv,
fetchFromGitHub,
cmake,
openssl,
paho-mqtt-c,
enableStatic ? stdenv.hostPlatform.isStatic,
enableShared ? !stdenv.hostPlatform.isStatic,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "paho.mqtt.cpp";
version = "1.3.2";
version = "1.4.0";
src = fetchFromGitHub {
owner = "eclipse";
repo = "paho.mqtt.cpp";
rev = "v${version}";
hash = "sha256-c2umToT4w+L7bgzp1bCEcb0ECHvxKZ2t6JI5SmUySPo=";
rev = "v${finalAttrs.version}";
hash = "sha256-XAQSNjO34b2BPzAf7x4a+74UdKFH5lYNMJm4kE16nkA=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ openssl paho-mqtt-c ];
buildInputs = [
openssl
paho-mqtt-c
];
cmakeFlags = [
(lib.cmakeBool "PAHO_WITH_SSL" true)
@ -28,4 +40,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
};
}
})

View File

@ -11469,8 +11469,6 @@ with pkgs;
paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { };
paho-mqtt-cpp = callPackage ../development/libraries/paho-mqtt-cpp { };
pakcs = callPackage ../development/compilers/pakcs {
# Doesn't compile with GHC 9.0 due to whitespace syntax changes
# see also https://github.com/NixOS/nixpkgs/issues/166108