Jamie McClymont <jamie@kwiius.com> writes:

> ---
>  ...ommon-mk-don-t-leak-source-absolute-paths.patch | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)

Reviewed-by: Alyssa Ross <hi@alyssa.is>
Tested-by: Alyssa Ross <hi@alyssa.is>

> diff --git a/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch b/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch
> index 4b7a2f34779..244ba8f7521 100644
> --- a/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch
> +++ b/pkgs/os-specific/linux/chromium-os/common-mk/0001-common-mk-don-t-leak-source-absolute-paths.patch
> @@ -38,13 +38,11 @@ diff --git a/common-mk/pkg_config.gni b/common-mk/pkg_config.gni
>  index af3c3fb4c..151c49e56 100644
>  --- a/common-mk/pkg_config.gni
>  +++ b/common-mk/pkg_config.gni
> -@@ -81,12 +81,11 @@ template("generate_pkg_config") {
> +@@ -81,10 +81,11 @@ template("generate_pkg_config") {
>       if (!defined(output_name)) {
>         output_name = name
>       }
> --    outputs = [
> --      "${target_out_dir}/${output_name}.pc",
> --    ]
> +-    outputs = [ "${target_out_dir}/${output_name}.pc" ]
>  +    lib_path = "${target_out_dir}/${output_name}.pc"
>  +    outputs = [ lib_path ]
>   
> @@ -117,11 +115,11 @@ index 7fcb08341..692704288 100644
>       # Build protoc command line to run.
>       script = "//common-mk/file_generator_wrapper.py"
>  @@ -224,7 +225,7 @@ template("goproto_library") {
> -       "--proto_path",
> -       "${sysroot}/usr/share/proto",
> +     args += [
>         "--go_out",
> --      "${go_out_prefix}${root_gen_dir}/${proto_out_dir}",
> -+      "${go_out_prefix}${proto_out_dir}",
> +       # go_out_prefix can be empty, so we can always add a colon here.
> +-      "${go_out_prefix}:${root_gen_dir}/${proto_out_dir}",
> ++      "${go_out_prefix}:${proto_out_dir}",
>       ]
>       foreach(source, sources) {
>         args += [ rebase_path(source) ]
> -- 
> 2.31.1