Unverified Commit 3dafbb57 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #256427 from aaronjheng/localproxy 

localproxy: use protobuf3_21
parents a2e2e61b d2b4c7ce

pkgs/applications/networking/localproxy/default.nix

+17 −16
Original line number Diff line number Diff line
@@ -3,13 +3,14 @@ 
, fetchFromGitHub

, cmake

, openssl

, protobuf3_19

, protobuf3_21

, catch2

, boost181

, icu

}:

let

  boost = boost181.override { enableStatic = true; };

  protobuf = protobuf3_21.override { enableShared = false; };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "localproxy";
@@ -24,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [ cmake ];



  buildInputs = [ openssl protobuf3_19 catch2 boost icu ];

  buildInputs = [ openssl protobuf catch2 boost icu ];



  # causes redefinition of _FORTIFY_SOURCE

  hardeningDisable = [ "fortify3" ];

pkgs/development/libraries/protobuf/generic-v3-cmake.nix

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
  # downstream dependencies

, python3

, grpc

, enableShared ? !stdenv.hostPlatform.isStatic



, ...

}:
@@ -74,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { 
  cmakeFlags = [

    "-Dprotobuf_USE_EXTERNAL_GTEST=ON"

    "-Dprotobuf_ABSL_PROVIDER=package"

  ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [

  ] ++ lib.optionals enableShared [

    "-Dprotobuf_BUILD_SHARED_LIBS=ON"

  ]

  # Tests fail to build on 32-bit platforms; fixed in 3.22