05/18: gnu: docker: Apply "-trimpath" flag.

[guix-commits]

sharlatan pushed a commit to branch wip-go-team
in repository guix.

commit 987969e6cb828cc09157550c9d0fd9c5b3a75cb1
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Wed Jun 19 22:38:00 2024 +0100

    gnu: docker: Apply "-trimpath" flag.
    
    * gnu/packages/docker.scm (docker) [arguments]:
    <#:phases>: Remove 'remove-go-references phase.
    Set BUILDFLAGS=-trimpath to replace 'remove-go-references phase in
    'build phase.
    
    Change-Id: Iada1a8764808d26e476ca8ca87a23061834f78be
---
 gnu/packages/docker.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index b18de182fe..c033486c6a 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -547,6 +547,7 @@ runcexecutor/executor.go"
               ;; Our LD doesn't like the statically linked relocatable things
               ;; that go produces, so install the dynamic version of
               ;; dockerd instead.
+              (setenv "BUILDFLAGS" "-trimpath")
               (invoke "hack/make.sh" "dynbinary")))
           (replace 'check
             (lambda* (#:key tests? #:allow-other-keys)
@@ -570,9 +571,7 @@ runcexecutor/executor.go"
                 (install-file "bundles/dynbinary-daemon/dockerd" out-bin)
                 (install-file (string-append 
"bundles/dynbinary-daemon/dockerd-"
                                              (getenv "VERSION"))
-                              out-bin))))
-          (add-after 'install 'remove-go-references
-            (assoc-ref go:%standard-phases 'remove-go-references)))))
+                              out-bin)))))))
     (inputs
      (list btrfs-progs
            containerd       ; for containerd-shim