This patch hard-codes the Tk library directory during package initialization. See . diff --git a/generic/tkWindow.c b/generic/tkWindow.c index b5cbbab..96b5501 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -988,6 +988,7 @@ TkCreateMainWindow( Tcl_SetVar2(interp, "tk_patchLevel", NULL, TK_PATCH_LEVEL, TCL_GLOBAL_ONLY); Tcl_SetVar2(interp, "tk_version", NULL, TK_VERSION, TCL_GLOBAL_ONLY); + Tcl_SetVar2(interp, "tk_library", NULL, TK_LIBRARY, TCL_GLOBAL_ONLY); tsdPtr->numMainWindows++; return tkwin; diff --git a/unix/Makefile.in b/unix/Makefile.in index f21fdbb..c61b0df 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1029,7 +1029,7 @@ tkVisual.o: $(GENERIC_DIR)/tkVisual.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c tkWindow.o: $(GENERIC_DIR)/tkWindow.c - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c + $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" $(GENERIC_DIR)/tkWindow.c tkButton.o: $(GENERIC_DIR)/tkButton.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c '/guix/refs/?id=612d6a8e5b65774cbebf5b26515ffa9fbba57507'>refslogtreecommitdiff
path: root/gnu/system/file-systems.scm
AgeCommit message (Expand)Author
2019-11-04file-systems: Mount /var/run/nscd read-write in containers....Fixes <https://bugs.gnu.org/37967>. Reported by Ivan Vilata i Balaguer <ivan@selidor.net>. * gnu/system/file-systems.scm (%network-file-mappings): Set 'writable?' to #true for /var/run/nscd. Ludovic Courtès
2019-09-12file-systems: Add /var/run/nscd to '%network-file-mappings'....This allows containers created by "guix environment -CN" or by "guix system container -N" to talk to the host nscd. * gnu/system/file-systems.scm (%network-file-mappings): Add "/var/run/nscd". * gnu/build/shepherd.scm (default-mounts)[nscd-socket]: Remove. * gnu/system/linux-container.scm (container-script)[nscd-run-directory] [nscd-mapping, nscd-os, nscd-specs]: Remove. [script]: Filter out from SPECS bind-mounts where the device does not exist. * guix/scripts/environment.scm (launch-environment/container) [optional-mapping->fs]: New procedure. [mappings]: Remove %NETWORK-FILE-MAPPINGS. [file-systems]: Add %NETWORK-FILE-MAPPINGS here, filtered through 'optional-mapping->fs'. Ludovic Courtès
2019-07-19file-systems: Use 'no-atime' for %IMMUTABLE-STORE....* gnu/system/file-systems.scm (%immutable-store): Add 'no-atime'. Ludovic Courtès