diff --git a/pkgs/by-name/zl/zlog/package.nix b/pkgs/by-name/zl/zlog/package.nix index 9054ae1a6a54..e8f4b3f8473a 100644 --- a/pkgs/by-name/zl/zlog/package.nix +++ b/pkgs/by-name/zl/zlog/package.nix @@ -2,40 +2,28 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, + cmake, }: -stdenv.mkDerivation rec { - version = "1.2.17"; +stdenv.mkDerivation (finalAttrs: { pname = "zlog"; + version = "1.2.18"; src = fetchFromGitHub { owner = "HardySimpson"; - repo = pname; - rev = version; - sha256 = "sha256-ckpDMRLxObpl8N539DC5u2bPpmD7jM+KugurUfta6tg="; + repo = "zlog"; + tag = finalAttrs.version; + hash = "sha256-79yyOGKgqUR1KI2+ngZd7jfVcz4Dw1IxaYfBJyjsxYc="; }; - patches = [ - (fetchpatch { - name = "CVE-2024-22857.patch"; - url = "https://github.com/HardySimpson/zlog/commit/c47f781a9f1e9604f5201e27d046d925d0d48ac4.patch"; - hash = "sha256-3FAAHJ2R/OpNpErWXptjEh0x370/jzvK2VhuUuyaOjE="; - }) - ]; + nativeBuildInputs = [ cmake ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - makeFlagsArray+=(CFLAGS="-Wno-pointer-to-int-cast -Wno-newline-eof") - ''; - - meta = with lib; { + meta = { description = "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; homepage = "https://hardysimpson.github.io/zlog/"; - license = licenses.lgpl21; - maintainers = [ maintainers.matthiasbeyer ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ matthiasbeyer ]; mainProgram = "zlog-chk-conf"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +})