diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/libraries/protobuf | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/protobuf')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/protobuf/3.23.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.23.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.23.nix new file mode 100644 index 000000000000..2d658d57419b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/protobuf/3.23.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic-v3-cmake.nix ({ + version = "3.23.4"; + sha256 = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; +} // args) diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix index dfe2a6d7a965..384d2d0decb4 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -68,16 +68,17 @@ let ]; buildInputs = [ - abseil-cpp zlib ]; - # After 3.20, CMakeLists.txt can now be found at the top-level, however - # a stub cmake/CMakeLists.txt still exists for compatibility with previous build assumptions - cmakeDir = "../cmake"; + propagatedBuildInputs = [ + abseil-cpp + ]; + + cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null; cmakeFlags = [ "-Dprotobuf_ABSL_PROVIDER=package" - ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [ + ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [ "-Dprotobuf_BUILD_SHARED_LIBS=ON" ] # Tests fail to build on 32-bit platforms; fixed in 3.22 @@ -95,6 +96,8 @@ let protobuf = self; }); }; + + inherit abseil-cpp; }; meta = { |