nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-12 15:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

nanopb: Fix self-inclusive src

Browse Source 
Fixes issue described in #301014

(cherry picked from commit 892f87e214)
This commit is contained in:
Pyrox 2024-05-29 13:36:58 -04:00 committed by github-actions[bot]
parent 445fe1d561
commit a5cb7f7f3a
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix
View File

@ -1,9 +1,12 @@
{ stdenv, protobuf, nanopb }:
{ lib, stdenv, protobuf, nanopb }:
stdenv.mkDerivation {
name = "nanopb-test-message-with-annotations";
meta.timeout = 60;
src = ./.;
src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.unions [ ./withannotations.proto ];
};
# protoc requires any .proto file to be compiled to reside within it's
# proto_path. By default the current directory is automatically added to the

10
pkgs/development/libraries/nanopb/test-message-with-options/default.nix
View File

@ -1,9 +1,15 @@
{ stdenv, protobuf, nanopb }:
{ lib, stdenv, protobuf, nanopb }:
stdenv.mkDerivation {
name = "nanopb-test-message-with-options";
meta.timeout = 60;
src = ./.;
src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.unions [
./withoptions.proto
./withoptions.options
];
};
# protoc requires any .proto file to be compiled to reside within it's
# proto_path. By default the current directory is automatically added to the

7
pkgs/development/libraries/nanopb/test-simple-proto2/default.nix
View File

@ -1,9 +1,12 @@
{ stdenv, protobuf, nanopb }:
{ lib, stdenv, protobuf, nanopb }:
stdenv.mkDerivation {
name = "nanopb-test-simple-proto2";
meta.timeout = 60;
src = ./.;
src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.unions [ ./simple.proto ];
};
# protoc requires any .proto file to be compiled to reside within it's
# proto_path. By default the current directory is automatically added to the

8
pkgs/development/libraries/nanopb/test-simple-proto3/default.nix
View File

@ -1,10 +1,12 @@
{ stdenv, protobuf, nanopb }:
{ lib, stdenv, protobuf, nanopb }:
stdenv.mkDerivation {
name = "nanopb-test-simple-proto3";
meta.timeout = 60;
src = ./.;
src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.unions [ ./simple.proto ];
};
# protoc requires any .proto file to be compiled to reside within it's
# proto_path. By default the current directory is automatically added to the
# proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did