diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2024-01-04 00:03:40 -0500 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-01-04 00:03:40 -0500 |
| commit | ef4e4c9a2ccc1678182fa6e4409fff13c669fd14 (patch) | |
| tree | d1f097787a69fa3a7089f26ecfed8b5c267883db /gnu/packages/gl.scm | |
| parent | 42c448ee6e13d165807d83e8c48941bead4847c1 (diff) | |
| parent | 7b0863f07a113caef26fea13909bd97d250b629e (diff) | |
Merge branch 'master' into mesa-updates
Change-Id: I46ca25bea98d25150877421c6d5161752afabb25
Diffstat (limited to 'gnu/packages/gl.scm')
| -rw-r--r-- | gnu/packages/gl.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index dfe9be73c0..ee76fe0ec0 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -690,7 +690,12 @@ glxdemo, glxgears, glxheads, and glxinfo.") #t)))) (build-system gnu-build-system) (arguments - (list #:make-flags #~(list (string-append "GLEW_PREFIX=" #$output) + (list #:make-flags #~(list #$@(if (%current-target-system) + #~((string-append "CC=" #$(cc-for-target)) + (string-append "LD=" #$(cc-for-target)) + (string-append "STRIP=" #$(strip-for-target))) + #~()) + (string-append "GLEW_PREFIX=" #$output) (string-append "GLEW_DEST=" #$output)) #:phases #~(modify-phases %standard-phases @@ -915,7 +920,7 @@ OpenGL.") (define-public glfw (package (name "glfw") - (version "3.3.4") + (version "3.3.9") (source (origin (method url-fetch) (uri (string-append "https://github.com/glfw/glfw" @@ -923,7 +928,7 @@ OpenGL.") "/glfw-" version ".zip")) (sha256 (base32 - "1kcrpl4d6b6h23ib5j9q670d9w3knd07whgbanbmwwhbcqnc9lmv")))) + "023dn97n4h14n5lbjpzjv0y6a2plj254c0w3rr3wraf3z08189jm")))) (build-system cmake-build-system) (arguments (list |