public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nanopb: Use protoc from buildPackages

Browse Source 
This fixes cross compilation.

(cherry picked from commit d8b35aa96bd0947f9a924fdde09bd43e3fa91053)
This commit is contained in:
adisbladis 2021-10-12 11:21:55 -05:00 committed by github-actions[bot]
parent d50679e56e
commit 4e14b76286
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/nanopb/default.nix
View File

@ -5,6 +5,7 @@
, protobuf , protobuf
, python3 , python3
, stdenv , stdenv
, buildPackages
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,} "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,}
"-DBUILD_STATIC_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.a "-DBUILD_STATIC_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.a
"-Dnanopb_PROTOC_PATH=${protobuf}/bin/protoc" "-Dnanopb_PROTOC_PATH=${buildPackages.protobuf}/bin/protoc"
]; ];
postInstall = '' postInstall = ''