[bug#61360] [PATCH] gnu: gimp: Don't retain reference on GCC.

[bug#61360] [PATCH] gnu: gimp: Don't retain reference on GCC.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

Partly fixes <https://issues.guix.gnu.org/57677>.

* gnu/packages/gimp.scm (gimp)[arguments]: Add #:modules and #:phases.
---
 gnu/packages/gimp.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index beb43f0ae2..69281f98e9 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -302,6 +302,19 @@ (define-public gimp
                "doc"))                  ; 9 MiB of gtk-doc HTML
     (arguments
      (list
+      #:modules `((ice-9 popen)
+                  (ice-9 rdelim)
+                  ,@%gnu-build-system-modules)
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-gcc-reference
+            ;; Avoid reference to GCC.
+            (lambda _
+              (let* ((port (open-input-pipe "gcc -v 2>&1 | tail -n 1"))
+                     (cc-version (read-line port)))
+                (close-pipe port)
+                (substitute* "app/gimp-version.c"
+                  (("CC_VERSION") (string-append "\"" cc-version "\"")))))))
       #:configure-flags
       #~(list (string-append "--with-html-dir=" #$output "/share/gtk-doc/html")
 
-- 
2.39.1

[bug#61360] [PATCH] gnu: gimp: Don't retain reference on GCC.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 424 bytes --]


iyzsong--- via Guix-patches via <guix-patches@gnu.org> writes:

> From: 宋文武 <iyzsong@member.fsf.org>
>
> Partly fixes <https://issues.guix.gnu.org/57677>.
>
> * gnu/packages/gimp.scm (gimp)[arguments]: Add #:modules and #:phases.
> ---
>  gnu/packages/gimp.scm | 13 +++++++++++++
>  1 file changed, 13 insertions(+)

I don't quite get what's going on here, but it seems good to push.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

bug#61360: [PATCH] gnu: gimp: Don't retain reference on GCC.

[宋文武 via Guix-patches via]

Christopher Baines <mail@cbaines.net> writes:

> iyzsong--- via Guix-patches via <guix-patches@gnu.org> writes:
>
>> From: 宋文武 <iyzsong@member.fsf.org>
>>
>> Partly fixes <https://issues.guix.gnu.org/57677>.
>>
>> * gnu/packages/gimp.scm (gimp)[arguments]: Add #:modules and #:phases.
>> ---
>>  gnu/packages/gimp.scm | 13 +++++++++++++
>>  1 file changed, 13 insertions(+)
>
> I don't quite get what's going on here, but it seems good to push.
>

Pushed, thank you!