diff options
| author | Marius Bakke <marius@gnu.org> | 2022-06-23 19:10:12 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-06-23 19:55:43 +0200 |
| commit | 2692624ecfcd5e509df9704cfd38b167a8eb5692 (patch) | |
| tree | da25936019edaad905e1f3e7421c9b558bcca9aa /gnu | |
| parent | 32c676bbcd756f13fb6a5b978e069db54d5914a6 (diff) | |
| download | guix-2692624ecfcd5e509df9704cfd38b167a8eb5692.tar.gz | |
gnu: libepoxy: Use new style.
* gnu/packages/gl.scm (libepoxy)[arguments]: Use gexp and remove labels. While at it, remove obsolete substitution.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gl.scm | 21 |
1 files 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)) |