diff mbox series

[bug#66436,1/2] gnu: git-lfs: Patch /bin/sh references.

Message ID 2343e018a06ef7e1ce7d9d7cc2e6d30c76027277.1697078865.git.maxim.cournoyer@gmail.com
State New
Headers show
Series [bug#66436,1/2] gnu: git-lfs: Patch /bin/sh references. | expand

Commit Message

Maxim Cournoyer Oct. 12, 2023, 2:48 a.m. UTC 
* gnu/packages/version-control.scm (git-lfs)
[arguments]: Add patch-/bin/sh phase.

Change-Id: I2d455e683e4f6e30cd32f5b1fdaccac71616826c
---
 gnu/packages/version-control.scm | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Ludovic Courtès Oct. 14, 2023, 5:04 p.m. UTC | #1 
Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

> * gnu/packages/version-control.scm (git-lfs)
> [arguments]: Add patch-/bin/sh phase.

LGTM!
Maxim Cournoyer Oct. 16, 2023, 2:46 p.m. UTC | #2 
Hi,

Ludovic Courtès <ludo@gnu.org> writes:

> Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:
>
>> * gnu/packages/version-control.scm (git-lfs)
>> [arguments]: Add patch-/bin/sh phase.
>
> LGTM!

I've installed this commit, thanks.
Maxim Cournoyer Oct. 16, 2023, 9:28 p.m. UTC | #3 
Hi,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> * gnu/packages/version-control.scm (git-lfs)
> [arguments]: Add patch-/bin/sh phase.
>
> Change-Id: I2d455e683e4f6e30cd32f5b1fdaccac71616826c
> ---
>  gnu/packages/version-control.scm | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
> index d9c53af71c..04b52f2a85 100644
> --- a/gnu/packages/version-control.scm
> +++ b/gnu/packages/version-control.scm
> @@ -3175,6 +3175,11 @@ (define-public git-lfs
>        #:install-source? #f
>        #:phases
>        #~(modify-phases %standard-phases
> +          (add-after 'unpack 'patch-/bin/sh
> +            (lambda* (#:key inputs #:allow-other-keys)
> +              (substitute* "src/github.com/git-lfs/git-lfs/lfs/hook.go"
> +                (("/bin/sh")
> +                 (search-input-file inputs "bin/sh")))))
>            (add-after 'unpack 'fix-embed-x-net
>              (lambda _
>                (delete-file-recursively "src/golang.org/x/net/publicsuffix/data")

That one has been merged with commit
b6a070d2a3c059c1a574dc4048fb8f942e008799.
diff mbox series

Patch

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index d9c53af71c..04b52f2a85 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3175,6 +3175,11 @@  (define-public git-lfs
       #:install-source? #f
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-/bin/sh
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "src/github.com/git-lfs/git-lfs/lfs/hook.go"
+                (("/bin/sh")
+                 (search-input-file inputs "bin/sh")))))
           (add-after 'unpack 'fix-embed-x-net
             (lambda _
               (delete-file-recursively "src/golang.org/x/net/publicsuffix/data")