Merge pull request #136450 from LeSuisse/mosquitto-2.0.12-21.05
This commit is contained in:
commit
8db3d39036
@ -12,19 +12,29 @@
|
|||||||
, openssl
|
, openssl
|
||||||
, withSystemd ? stdenv.isLinux
|
, withSystemd ? stdenv.isLinux
|
||||||
, systemd
|
, systemd
|
||||||
|
, fetchpatch
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mosquitto";
|
pname = "mosquitto";
|
||||||
version = "2.0.10";
|
version = "2.0.12";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "eclipse";
|
owner = "eclipse";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "144vw7b9ja4lci4mplbxs048x9aixd9c3s7rg6wc1k31w099rb12";
|
sha256 = "0bn6vpk6gdxrnm3aw3j2g0ny6cx2arv8pmv4x8302pr6qcrz57s6";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = lib.optionals stdenv.isDarwin [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "revert-cmake-shared-to-module.patch"; # See https://github.com/eclipse/mosquitto/issues/2277
|
||||||
|
url = "https://github.com/eclipse/mosquitto/commit/e21eaeca37196439b3e89bb8fd2eb1903ef94845.patch";
|
||||||
|
sha256 = "14syi2c1rks8sl2aw09my276w45yq1iasvzkqcrqwy4drdqrf069";
|
||||||
|
revert = true;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
for f in html manpage ; do
|
for f in html manpage ; do
|
||||||
substituteInPlace man/$f.xsl \
|
substituteInPlace man/$f.xsl \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user