diff options
author | Silvan Mosberger <contact@infinisil.com> | 2024-06-17 17:17:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-17 17:17:55 +0200 |
commit | ccf06777cbc852bcecb005596f7f4878414fbcad (patch) | |
tree | 5ddf0be5d38e44efa317b9746896050d63aac1e4 /pkgs/development/libraries | |
parent | 8e85d5b08bc617fb095e6973a5411f3256bcd849 (diff) | |
parent | 892f87e2147b0d44471c78b00fbfd1c211d17fc6 (diff) |
Merge pull request #315684 from pyrox0/nanopb-self-inclusive-src
nanopb: Fix self-inclusive src
Diffstat (limited to 'pkgs/development/libraries')
4 files changed, 23 insertions, 9 deletions
diff --git a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix index 9eca4dbb93688..c2ffe6135fbb5 100644 --- a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix +++ b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix @@ -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 diff --git a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix index 0030158df91b3..f6bf28f3b6457 100644 --- a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix +++ b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix @@ -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 diff --git a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix index d1d3e1a855a70..f8cd35cbf3979 100644 --- a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix +++ b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix @@ -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 diff --git a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix index 71507054458fe..d92698d21ece5 100644 --- a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix +++ b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix @@ -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 |