10/21: gnu: libepoxy: Use new style.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit 2692624ecfcd5e509df9704cfd38b167a8eb5692
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Jun 23 19:10:12 2022 +0200

    gnu: libepoxy: Use new style.
    
    * gnu/packages/gl.scm (libepoxy)[arguments]: Use gexp and remove labels.
    While at it, remove obsolete substitution.
---
 gnu/packages/gl.scm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 3a57af44a5..4ee5f85b32 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -68,6 +68,7 @@
   #:use-module (guix build-system waf)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (ice-9 match)
   #:use-module ((srfi srfi-1) #:hide (zip)))
@@ -727,17 +728,15 @@ OpenGL graphics API.")
                (base32
                 "0jw02bzdwynyrwsn5rhcacv92h9xx928j3xp436f8gdnwlyb5641"))))
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'patch-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((python (assoc-ref inputs "python"))
-                   (mesa (assoc-ref inputs "mesa")))
-               (substitute* "src/gen_dispatch.py"
-                 (("/usr/bin/env python") python))
-               (substitute* (find-files "." "\\.[ch]$")
-                 (("libGL.so.1") (string-append mesa "/lib/libGL.so.1"))
-                 (("libEGL.so.1") (string-append mesa 
"/lib/libEGL.so.1")))))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'patch-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((mesa (dirname (search-input-file inputs "lib/libGL.so"))))
+                (substitute* (find-files "." "\\.[ch]$")
+                  (("libGL.so.1") (string-append mesa "/libGL.so.1"))
+                  (("libEGL.so.1") (string-append mesa "/libEGL.so.1")))))))))
     (build-system meson-build-system)
     (native-inputs
      (list pkg-config python))