diff --git a/pkgs/by-name/js/jsoncpp/package.nix b/pkgs/by-name/js/jsoncpp/package.nix index 973cffb3a41c..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" @@ -35,10 +38,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 +45,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" 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.