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

Merge pull request #141389 from NixOS/backport-141379-to-release-21.05

Browse Source 
[Backport release-21.05] nanopb: Use protoc from buildPackages
This commit is contained in:
adisbladis
2021-10-12 17:37:22 -05:00
committed by GitHub
parent d50679e56e 4e14b76286
commit 83070001ea
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/nanopb/default.nix
+2 -1
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 = ''