b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

jsoncpp: fix enableStatic

Browse source 
The workaround is no longer needed for static builds.
This commit is contained in:
Elliot Cameron 2023-04-21 00:39:40 -04:00
parent fa9859507b
commit 40f8d8b256
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/jsoncpp/default.nix
View file

@ -40,19 +40,13 @@ stdenv.mkDerivation rec {
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_OBJECT_LIBS=OFF"
"-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
"-DBUILD_STATIC_LIBS=${if enableStatic then "ON" else "OFF"}"
]
# the test's won't compile if secureMemory is used because there is no
# comparison operators and conversion functions between
# std::basic_string<..., Json::SecureAllocator<char>> vs.
# std::basic_string<..., [default allocator]>
++ lib.optional ((stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory) "-DJSONCPP_WITH_TESTS=OFF"
++ lib.optional (!enableStatic) "-DBUILD_STATIC_LIBS=OFF";
# this is fixed and no longer necessary in 1.9.5 but there they use
# memset_s without switching to a different c++ standard in the cmake files
postInstall = lib.optionalString enableStatic ''
(cd $out/lib && ln -sf libjsoncpp_static.a libjsoncpp.a)
'';
++ lib.optional ((stdenv.buildPlatform != stdenv.hostPlatform) || secureMemory) "-DJSONCPP_WITH_TESTS=OFF";
meta = with lib; {
homepage = "https://github.com/open-source-parsers/jsoncpp";