diff --git a/src/Intrinsic.c b/src/Intrinsic.c
--- a/src/Intrinsic.c
+++ b/src/Intrinsic.c
@@ -1345,21 +1345,99 @@ FillInLangSubs(Substitution subs, XtPerDisplay pd)
}
/*
- * default path used if environment variable XFILESEARCHPATH
- * is not defined. Also substitued for %D.
- * The exact value should be documented in the implementation
- * notes for any Xt implementation.
+ Return the default search path for the function
+ XtResolvePathname to use if XFILESEARCHPATH is
+ not defined.
+
+ It returns the combination the set of values which are the 6 "stems" below,
+ prepended with "/run/current-system/profile", and $GUIX_PROFILE and
+ "$HOME/.guix-profile"
+
+ These values provide the default paths where Guix/GuixSD can expect
+ to find resources for installed packages.
*/
static const char *
-implementation_default_path(void)
+guix_default_path(void)
{
-#if defined(WIN32)
- static char xfilesearchpath[] = "";
+ static const char *search_path_default_stem[] = {
+ "/lib/X11/%L/%T/%N%C%S",
+ "/lib/X11/%l/%T/%N%C%S",
+ "/lib/X11/%T/%N%C%S",
+ "/lib/X11/%L/%T/%N%S",
+ "/lib/X11/%l/%T/%N%S",
+ "/lib/X11/%T/%N%S"
+ };
+
+#define SIZEOF_STEMS (strlen (search_path_default_stem[0]) \
+ + strlen (search_path_default_stem[1]) \
+ + strlen (search_path_default_stem[2]) \
+ + strlen (search_path_default_stem[3]) \
+ + strlen (search_path_default_stem[4]) \
+ + strlen (search_path_default_stem[5]))
+
+
+ int i;
+ const char *current_profile = "/run/current-system/profile";
+ char *home = getenv ("HOME");
+ char *guix_profile = getenv ("GUIX_PROFILE");
+
+ size_t bytesAllocd = SIZEOF_STEMS + 1;
+
+ /* This function is evaluated multiple times and the calling
+ code assumes that it is idempotent. So we must not allow
+ (say) a changed environment variable to cause it to return
+ something different. */
+ static char *path = NULL;
+ if (path)
+ return path;
+
+ bytesAllocd += 6 * (1 + strlen (current_profile));
+
+ if (guix_profile != NULL)
+ {
+ bytesAllocd += SIZEOF_STEMS;
+ bytesAllocd += 6 * (1 + strlen (guix_profile));
+ }
- return xfilesearchpath;
-#else
- return XFILESEARCHPATHDEFAULT;
-#endif
+ if (home != NULL)
+ {
+ bytesAllocd += SIZEOF_STEMS;
+ bytesAllocd += 6 * (1 + strlen(home) + strlen ("/.guix-profile"));
+ }
+
+ path = XtMalloc(bytesAllocd);
+ if (path == NULL) _XtAllocError(NULL);
+
+ memset (path, 0, bytesAllocd);
+
+ for (i = 0 ; i < 6 ; ++i)
+ {
+ strcat (path, current_profile);
+ strcat (path, search_path_default_stem[i]);
+ strcat (path, ":");
+ }
+
+ if (guix_profile != NULL)
+ for (i = 0 ; i < 6 ; ++i)
+ {
+ strcat (path, guix_profile);
+ strcat (path, search_path_default_stem[i]);
+ strcat (path, ":");
+ }
+
+ if (home != NULL)
+ for (i = 0 ; i < 6 ; ++i)
+ {
+ strcat (path, home);
+ strcat (path, "/.guix-profile");
+ strcat (path, search_path_default_stem[i]);
+ strcat (path, ":");
+ }
+
+ /* Remove final : */
+ path[strlen(path) - 1] = '\0';
+
+ return path;
}
@@ -1388,7 +1466,7 @@ XtResolvePathname(Display *dpy,
{
XtPerDisplay pd;
static const char *defaultPath = NULL;
- const char *impl_default = implementation_default_path();
+ const char *impl_default = guix_default_path();
int idef_len = (int) strlen(impl_default);
char *massagedPath;
int bytesAllocd, bytesLeft;
nu/system/examples/lightweight-desktop.tmpl: Likewise.
* gnu/tests/install.scm (installation-target-desktop-os-for-gui-tests)
[packages]: Likewise
* gnu/installer/newt/services.scm (run-desktop-environments-cbt-page): Make
one entry taller.
| Jan (janneke) Nieuwenhuizen |
| 2020-04-15 | Merge branch 'master' into core-updates | Marius Bakke |
| 2020-04-14 | maint: Ensure substitutes are available for '%default-xorg-modules'....* etc/release-manifest.scm (%system-packages): Append
%DEFAULT-XORG-MODULES.
| Ludovic Courtès |
| 2020-04-14 | maint: Actually check for the availablility of system packages....* etc/release-manifest.scm (%system-manifest): New variable.
<top level>: Add it in 'concatenate-manifests' call.
| Ludovic Courtès |
| 2020-04-08 | maint: Adjust release manifest for Guile 3.0 switch....* etc/release-manifest.scm (%packages-to-cross-build): Refer to
GUILE-3.0/FIXED instead of GUILE-2.2/FIXED.
| Marius Bakke |
| 2020-04-08 | maint: Cross-build GUILE-2.2/FIXED....* etc/release-manifest.scm (%packages-to-cross-build): Replace
"guile@2.2" with GUILE-2.2/FIXED.
| Ludovic Courtès |
| 2020-04-07 | maint: Remove GCC from the packages to cross-build....* etc/release-manifest.scm (%packages-to-cross-build): Remove GCC.
| Ludovic Courtès |
| 2020-04-04 | maint: Remove unsupported cross-compilation jobs from 'release-manifest.scm'....* etc/release-manifest.scm (%packages-to-cross-build-for-mingw): New
variable.
(%cross-manifest): Use it. Remove "riscv64-linux-gnu" from %CROSS-TARGETS.
| Ludovic Courtès |
| 2020-03-13 | maint: Add 'etc/release-manifest.scm'....* etc/release-manifest.scm: New file.
* gnu/ci.scm (%cross-targets): Export.
* build-aux/check-available-binaries.scm: Remove.
* Makefile.am (EXTRA_DIST): Add 'etc/release-manifest.scm' and remove
'build-aux/check-available-binaries.scm'.
(assert-binaries-available): Rewrite using 'guix weather -m'.
| Ludovic Courtès |