diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 16:57:37 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 17:15:08 -0400 |
| commit | 3bacd3c76a58ebe70f98be654f09cbd4166093ab (patch) | |
| tree | 89f687565205971a9925d33400235968a569a069 /gnu/packages/gl.scm | |
| parent | df3391c0309443ac37f9a9a6b1038a85454b8ee6 (diff) | |
| parent | 97ed675718b948319e6f6e51f2d577971bea1176 (diff) | |
| download | guix-3bacd3c76a58ebe70f98be654f09cbd4166093ab.tar guix-3bacd3c76a58ebe70f98be654f09cbd4166093ab.tar.gz | |
Merge branch 'master' into core-updates.
Conflicts:
gnu/local.mk
gnu/packages/build-tools.scm
gnu/packages/certs.scm
gnu/packages/check.scm
gnu/packages/compression.scm
gnu/packages/cups.scm
gnu/packages/fontutils.scm
gnu/packages/gnuzilla.scm
gnu/packages/guile.scm
gnu/packages/ibus.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/music.scm
gnu/packages/nss.scm
gnu/packages/pdf.scm
gnu/packages/python-xyz.scm
gnu/packages/qt.scm
gnu/packages/ruby.scm
gnu/packages/shells.scm
gnu/packages/tex.scm
gnu/packages/video.scm
gnu/packages/vulkan.scm
gnu/packages/web.scm
gnu/packages/webkit.scm
gnu/packages/wm.scm
Diffstat (limited to 'gnu/packages/gl.scm')
| -rw-r--r-- | gnu/packages/gl.scm | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b03ee7b4bd..3a63d70c7a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -110,7 +110,7 @@ as ASCII text.") (define-public freeglut (package (name "freeglut") - (version "3.2.2") + (version "3.4.0") (source (origin (method url-fetch) (uri (string-append @@ -118,7 +118,7 @@ as ASCII text.") "/download/v" version "/freeglut-" version ".tar.gz")) (sha256 (base32 - "0l3s57zw51fy3mn5qfdm4z775kfhflgxppanaxmskfzh5l44m565")))) + "1v7ayg3a03mv8b6lsr1qm21lbr8xg8dh3gdfxnbhl64vbn8wn2rw")))) (build-system cmake-build-system) (arguments '(#:tests? #f ;no test target @@ -606,14 +606,14 @@ glxdemo, glxgears, glxheads, and glxinfo.") (define-public glew (package (name "glew") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/glew/glew/" version "/glew-" version ".tgz")) (sha256 (base32 - "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4")) + "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l")) (modules '((guix build utils))) (snippet '(begin @@ -623,12 +623,15 @@ glxdemo, glxgears, glxheads, and glxinfo.") #t)))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases (delete 'configure)) - #:make-flags (list (string-append "GLEW_PREFIX=" - (assoc-ref %outputs "out")) - (string-append "GLEW_DEST=" - (assoc-ref %outputs "out"))) - #:tests? #f)) ;no 'check' target + (list #:make-flags #~(list (string-append "GLEW_PREFIX=" #$output) + (string-append "GLEW_DEST=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'delete-static + (lambda _ + (delete-file (string-append #$output "/lib/libGLEW.a"))))) + #:tests? #f)) ;no 'check' target (inputs (list libxi libxmu libx11 mesa)) |