diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/gl.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
| download | guix-4cf1acc7f3033b50b0bf19e02c9f522d522d338c.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: doc/guix.texi gnu/local.mk gnu/packages/admin.scm gnu/packages/base.scm gnu/packages/chromium.scm gnu/packages/compression.scm gnu/packages/databases.scm gnu/packages/diffoscope.scm gnu/packages/freedesktop.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/guile.scm gnu/packages/inkscape.scm gnu/packages/llvm.scm gnu/packages/openldap.scm gnu/packages/pciutils.scm gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/gl.scm')
| -rw-r--r-- | gnu/packages/gl.scm | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index dd62fac13e..3c99c3815d 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -577,30 +577,29 @@ from software emulation to complete hardware acceleration for modern GPUs.") (source (mesa-demos-source version)) (build-system gnu-build-system) (inputs - `(("mesa" ,mesa) - ("glut" ,freeglut) - ("glew" ,glew))) + (list mesa freeglut glew)) (native-inputs (list pkg-config)) (arguments - '(#:phases - (modify-phases %standard-phases - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (for-each - (lambda (file) - (copy-file file (string-append out "/bin/" (basename file)))) - '("src/xdemos/glxdemo" "src/xdemos/glxgears" - "src/xdemos/glxinfo" "src/xdemos/glxheads")) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out #$output)) + (mkdir-p (string-append out "/bin")) + (for-each (lambda (file) + (copy-file file + (string-append out "/bin/" + (basename file)))) + '("src/xdemos/glxdemo" "src/xdemos/glxgears" + "src/egl/opengl/eglinfo" + "src/xdemos/glxinfo" "src/xdemos/glxheads")))))))) (home-page "https://mesa3d.org/") (synopsis "Utility tools for Mesa") (description - "The mesa-utils package contains several utility tools for Mesa: glxdemo, -glxgears, glxheads, and glxinfo.") + "The mesa-utils package contains several utility tools for Mesa: eglinfo, +glxdemo, glxgears, glxheads, and glxinfo.") ;; glxdemo is public domain; others expat. (license (list license:expat license:public-domain)))) @@ -746,7 +745,7 @@ OpenGL graphics API.") (define-public libglvnd (package (name "libglvnd") - (version "1.3.4") + (version "1.5.0") (home-page "https://gitlab.freedesktop.org/glvnd/libglvnd") (source (origin (method git-fetch) @@ -756,7 +755,7 @@ OpenGL graphics API.") (file-name (git-file-name name version)) (sha256 (base32 - "0phvgg2h3pcz3x39gaymwb37bnw1s26clq9wsj0zx398zmp3dwpk")))) + "1nvlcwzivrdchp70i2l7ic7qdlsdmlsb0ckydscr43rhqldswx69")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Dx11=enabled") |