about summary refs log tree commit diff
diff options
context:
space:
mode:
authorHarald Hoyer <harald@hoyer.xyz>2024-01-25 09:39:41 +0100
committerSandro Jäckel <sandro.jaeckel@gmail.com>2024-05-07 22:42:04 +0200
commitb281d60c481374f33abae51507bc962eff451674 (patch)
tree7fb6ba4ca05b9f4022082fcdaf3cc6e2882316ed
parentd1c6a5decfd9ad4c84354612d418b2856a57be1d (diff)
protobuf-c: unstable-2023-07-08 -> 1.5.0
Release notes:
https://github.com/protobuf-c/protobuf-c/releases/tag/v1.5.0

Split out `dev` and `lib`.

Fixed anbox package moving protobufc to `nativeBuildInputs`, because
the `proto-c` tool is used at `build-time`.

Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
-rw-r--r--pkgs/development/libraries/protobufc/default.nix8
-rw-r--r--pkgs/os-specific/linux/anbox/default.nix3
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix
index d152512783f0e..5a39725275508 100644
--- a/pkgs/development/libraries/protobufc/default.nix
+++ b/pkgs/development/libraries/protobufc/default.nix
@@ -10,15 +10,17 @@
 
 stdenv.mkDerivation rec {
   pname = "protobuf-c";
-  version = "unstable-2023-07-08";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "protobuf-c";
     repo = "protobuf-c";
-    rev = "fa86fddbd000316772d1deb5a8d1201fa7599ef7";
-    hash = "sha256-pmqZYFREPgSrWPekymTglhtAv6gQR1gP3dOl3hqjYig=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Dkpcc7ZfvAIVY91trRiHuiRFcUGUbQxbheYKTBcq80I=";
   };
 
+  outputs = [ "out" "dev" "lib" ];
+
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ protobuf zlib ];
diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix
index a3724c792482e..6b52d84b7c6b0 100644
--- a/pkgs/os-specific/linux/anbox/default.nix
+++ b/pkgs/os-specific/linux/anbox/default.nix
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     makeWrapper
+    protobufc
   ];
 
   buildInputs = [
@@ -74,7 +75,7 @@ stdenv.mkDerivation rec {
     lxc
     mesa
     properties-cpp
-    protobuf protobufc
+    protobuf
     python3
     SDL2 SDL2_image
     systemd