Allow customVendorSrc for go sources

use rsync bin rsync directly into out Testing solution testing more testing more testing more testing more testing more remove rsync format
nix-community · Feb 17, 2022 · 0da5333 · 0da5333
1 parent c3f885a
commit 0da5333
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/builder/default.nix b/builder/default.nix
@@ -7,7 +7,6 @@
 , go
 }:
 let
-
   parseGoMod = import ./parser.nix;
 
   removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
@@ -21,6 +20,7 @@ let
     , allowGoReference ? false
     , meta ? { }
     , passthru ? { }
+    , customVendorSrc ? null
     , ...
     }@attrs:
     let
@@ -70,10 +70,17 @@ let
 
             go run ${./symlink.go}
             ${lib.concatStringsSep "\n" localReplaceCommands}
-
+          '' +
+          (if customVendorSrc == null
+          then ""
+          else ''
+            cp -R ${customVendorSrc}/* vendor/
+          ''
+          ) +
+          ''
             find vendor
 
-            mv vendor $out
+            cp -R vendor $out
           ''
         );
 

diff --git a/builder/parser.nix b/builder/parser.nix
@@ -1,7 +1,6 @@
 # Parse go.mod in Nix
 # Returns a Nix structure with the contents of the go.mod passed in
 # in normalised form.
-
 let
   inherit (builtins) elemAt mapAttrs split foldl' match filter typeOf;