guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch core-updates-frozen updated: gnu: gnome-shell: Do not wrap in LD_


From: guix-commits
Subject: branch core-updates-frozen updated: gnu: gnome-shell: Do not wrap in LD_LIBRARY_PATH.
Date: Thu, 02 Dec 2021 04:54:30 -0500

This is an automated email from the git hooks/post-receive script.

rekado pushed a commit to branch core-updates-frozen
in repository guix.

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new f1fd313  gnu: gnome-shell: Do not wrap in LD_LIBRARY_PATH.
f1fd313 is described below

commit f1fd313e486491caf1ff5874810f2ee06091e825
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Thu Dec 2 10:52:45 2021 +0100

    gnu: gnome-shell: Do not wrap in LD_LIBRARY_PATH.
    
    Fixes <https://bugs.gnu.org/37123>.
    
    * gnu/packages/gnome.scm (gnome-shell)[arguments]: Remove LD_LIBRARY_PATH 
from
    wrapper.
---
 gnu/packages/gnome.scm | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5f99616..35ac022 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8836,15 +8836,7 @@ properties, screen resolution, and other GNOME 
parameters.")
                    (gi-typelib-path  (getenv "GI_TYPELIB_PATH"))
                    (python-path      (getenv "GUIX_PYTHONPATH")))
                (wrap-program (string-append out "/bin/gnome-shell")
-                 `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
-                 ;; FIXME: gnome-shell loads these libraries with unqualified
-                 ;; names only, so they need to be on LD_LIBRARY_PATH.  The
-                 ;; alternative might be to patch gnome-shell.
-                 `("LD_LIBRARY_PATH" ":" prefix
-                   ,(map (lambda (pkg)
-                           (string-append (assoc-ref inputs pkg) "/lib"))
-                         '("gdk-pixbuf"
-                           "gnome-bluetooth" "librsvg" "libgweather"))))
+                 `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))
                (for-each
                 (lambda (prog)
                   (wrap-program (string-append out "/bin/" prog)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]