From 7b42e5eb9970f7a56f7566e055a9109d00892c7f Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 5 May 2026 11:39:57 +0200 Subject: [PATCH 1/3] jsoncpp: fix build with secure memory jsoncpp changed the secure memory definition with 1.9.7 and made it possible to enable it directly via cmake. Signed-off-by: Markus Theil --- pkgs/by-name/js/jsoncpp/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/js/jsoncpp/package.nix b/pkgs/by-name/js/jsoncpp/package.nix index 973cffb3a41c..dcdd318a49fe 100644 --- a/pkgs/by-name/js/jsoncpp/package.nix +++ b/pkgs/by-name/js/jsoncpp/package.nix @@ -35,10 +35,6 @@ stdenv.mkDerivation (finalAttrs: { export sourceRoot=${finalAttrs.src.name} ''; - postPatch = lib.optionalString secureMemory '' - sed -i 's/#define JSONCPP_USING_SECURE_MEMORY 0/#define JSONCPP_USING_SECURE_MEMORY 1/' include/json/version.h - ''; - nativeBuildInputs = [ cmake python3 @@ -46,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ + "-DJSONCPP_USE_SECURE_MEMORY=${if secureMemory then "ON" else "OFF"}" "-DBUILD_SHARED_LIBS=ON" "-DBUILD_OBJECT_LIBS=OFF" "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" From ea7f9147c4069240d6a80e2ed16bd7f7048786c2 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 5 May 2026 11:54:32 +0200 Subject: [PATCH 2/3] jsoncpp: add jsoncppSecureMemory alias Signed-off-by: Markus Theil --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a43f4b09bb0..7e0c6b6d5993 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6227,6 +6227,8 @@ with pkgs; } ); + jsoncppSecureMemory = jsoncpp.override { secureMemory = true; }; + mtrace = callPackage ../development/libraries/glibc/mtrace.nix { }; # Provided by libc on Operating Systems that use the Extensible Linker Format. From 45a647ebc7f52726da88f5a36c04dd6d016834de Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Tue, 5 May 2026 12:56:19 +0200 Subject: [PATCH 3/3] jsoncpp: enable required strictDeps and structuredAttrs Signed-off-by: Markus Theil --- pkgs/by-name/js/jsoncpp/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/js/jsoncpp/package.nix b/pkgs/by-name/js/jsoncpp/package.nix index dcdd318a49fe..b2961ed1516f 100644 --- a/pkgs/by-name/js/jsoncpp/package.nix +++ b/pkgs/by-name/js/jsoncpp/package.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "jsoncpp"; version = "1.9.7"; + strictDeps = true; + __structuredAttrs = true; + outputs = [ "out" "dev"