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 ?id=ece22a25b6d94b99748fcfc3dbdb492f9d99ea12'>refslogtreecommitdiff
path: root/gnu/services/cups.scm
AgeCommit message (Expand)Author
2019-08-31services: cups: Rename ‘retry-this-job’ to ‘retry-current-job’....* gnu/services/cups.scm (error-policy, cups-configuration): Substitute RETRY-CURRENT-JOB for the obsolete RETRY-THIS-JOB name of this policy. * doc/guix.texi (Printing Services): Likewise. Tobias Geerinckx-Rice
2019-08-30services: cups: Move SET-ENV to FILES-CONFIGURATION....* gnu/services/cups.scm (cups-configuration): Move SET-ENV from here… (files-configuration): …to here. * doc/guix.texi (Printing Services): Adjust accordingly. Tobias Geerinckx-Rice
2019-08-30services: cups: Add BrowseDNSSDSubTypes directive....* gnu/services/cups.scm (comma-separated-string-list?) (serialize-comma-separated-string-list): New variables. (cups-configuration)[browse-dns-sd-sub-types]: New field. * doc/guix.texi (Printing Services): Document it. Tobias Geerinckx-Rice
2019-08-27services: cups: Update SSL-OPTIONS docstring....This follows up on commit f9c1ebdb7daea30ceaf73f43bf15c222dc4a58ad. * gnu/services/cups.scm (cups-configuration)<ssl-options>: Update docstring. Tobias Geerinckx-Rice
2019-08-27services: cups: Complete SSL-OPTIONS....…except for ‘AllowDH’, which makes no sense on GNU TLS systems. * gnu/services/cups.scm (ssl-options?): Validate ‘DenyCBC’ and ‘DenyTLS1.0’. * doc/guix.texi (Printing Services): Document them both. Tobias Geerinckx-Rice
2019-06-05services: cups: Create /var/cache on activation....* gnu/services/cups.scm (%cups-activation): Create /var/cache if it doesn't exist yet. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Alex Griffin
2019-03-13Remove traces of "GuixSD"....* gnu/bootloader/extlinux.scm (extlinux-configuration-file): Remove mentions of "GuixSD". * gnu/bootloader/grub.scm (install-grub-efi): Likewise. * gnu/build/vm.scm (make-iso9660-image): Change default #:volume-id to "Guix_image". (initialize-hard-disk): Search for the "Guix_image" label. * gnu/ci.scm (system-test-jobs, tarball-jobs): Remove "GuixSD". * gnu/installer/newt/welcome.scm (run-welcome-page): Likewise. * gnu/packages/audio.scm (supercollider)[description]: Likewise. * gnu/packages/curl.scm (curl): Likewise. * gnu/packages/emacs.scm (emacs): Likewise. * gnu/packages/gnome.scm (network-manager): Likewise. * gnu/packages/julia.scm (julia): Likewise. * gnu/packages/linux.scm (alsa-plugins): Likewise. (powertop, wireless-regdb): Likewise. * gnu/packages/package-management.scm (guix): Likewise. * gnu/packages/polkit.scm (polkit): Likewise. * gnu/packages/tex.scm (texlive-bin): Likewise. * gnu/services/base.scm (file-systems->fstab): Likewise. * gnu/services/cups.scm (%cups-activation): Likewise. * gnu/services/mail.scm (%dovecot-activation): Likewise. * gnu/services/messaging.scm (prosody-configuration)[log]: Likewise. * gnu/system/examples/vm-image.tmpl (vm-image-motd): Likewise. * gnu/system/install.scm (installation-os)[file-systems]: Change root file system label to "Guix_image". * gnu/system/mapped-devices.scm (check-device-initrd-modules): Remove "GuixSD". * gnu/system/vm.scm (system-docker-image): Likewise. (system-disk-image)[root-label]: Change to "Guix_image". * gnu/tests/install.scm (run-install): Remove "GuixSD". * guix/modules.scm (guix-module-name?): Likewise. * nix/libstore/optimise-store.cc: Likewise. Ludovic Courtès