diff options
| author | adisbladis <adisbladis@gmail.com> | 2021-10-12 11:21:55 -0500 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-10-12 18:08:34 +0000 |
| commit | 4e14b762865b4bdc717ce14eec3b31b42377e4d2 (patch) | |
| tree | 3f04b2d48a39ac32bbae0852afb56c43d3ce1532 | |
| parent | Merge pull request #141099 from roberth/nixos-21.05-compat-136909 (diff) | |
| download | nixpkgs-origin/backport-141379-to-release-21.05.tar.gz | |
nanopb: Use protoc from buildPackagesorigin/backport-141379-to-release-21.05
This fixes cross compilation.
(cherry picked from commit d8b35aa96bd0947f9a924fdde09bd43e3fa91053)
| -rw-r--r-- | pkgs/development/libraries/nanopb/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/nanopb/default.nix b/pkgs/development/libraries/nanopb/default.nix index ca078a3f9d2a..c70298c4ff82 100644 --- a/pkgs/development/libraries/nanopb/default.nix +++ b/pkgs/development/libraries/nanopb/default.nix @@ -5,6 +5,7 @@ , protobuf , python3 , stdenv +, buildPackages }: stdenv.mkDerivation rec { @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,} "-DBUILD_STATIC_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.a - "-Dnanopb_PROTOC_PATH=${protobuf}/bin/protoc" + "-Dnanopb_PROTOC_PATH=${buildPackages.protobuf}/bin/protoc" ]; postInstall = '' |