mbakke pushed a commit to branch staging in repository guix. commit 43a8d83c08d736b613a385ff0d06941bd373b642 Author: Marius Bakke <mba...@fastmail.com> AuthorDate: Fri May 22 18:53:14 2020 +0200
gnu: Mesa: Install scripts to a separate output. * gnu/packages/gl.scm (mesa)[outputs]: New field. [arguments]: Add phase 'split-outputs'. --- gnu/packages/gl.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 3d94ddb..3d8d268 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -289,6 +289,7 @@ also known as DXTn or DXTC) for Mesa.") ("python" ,python-wrapper) ("python-mako" ,python-mako) ("which" ,(@ (gnu packages base) which)))) + (outputs '("out" "bin")) (arguments `(#:configure-flags '(,@(match (%current-system) @@ -382,6 +383,26 @@ also known as DXTn or DXTC) for Mesa.") (("\"gbm_dri\\.so") (string-append "\"" out "/lib/dri/gbm_dri.so"))) #t))) + (add-after 'install 'split-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + ,@(match (%current-system) + ((or "i686-linux" "x86_64-linux") + ;; Install the Vulkan overlay control script to a separate + ;; output to prevent a reference on Python, saving ~70 MiB + ;; on the closure size. + '((copy-recursively (string-append out "/bin") + (string-append bin "/bin")) + (delete-file-recursively (string-append out "/bin")))) + (_ + ;; XXX: On architectures without the Vulkan overlay layer + ;; just create an empty file because outputs can not be + ;; added conditionally. + '((mkdir-p (string-append bin "/bin")) + (call-with-output-file (string-append bin "/bin/.empty") + (const #t))))) + #t))) (add-after 'install 'symlinks-instead-of-hard-links (lambda* (#:key outputs #:allow-other-keys) ;; All the drivers and gallium targets create hard links upon