Use 'pkg-config' instead of heuristics to find 'tk' flags. --- matplotlib-1.4.3/setupext.py.orig 2015-12-01 14:21:19.554417453 +0100 +++ matplotlib-1.4.3/setupext.py 2015-12-02 10:39:47.282363530 +0100 @@ -1457,7 +1457,7 @@ p = subprocess.Popen( '. %s ; eval echo ${%s}' % (file, varname), shell=True, - executable="/bin/sh", + executable="sh", stdout=subprocess.PIPE) result = p.communicate()[0] return result.decode('ascii') @@ -1601,8 +1601,19 @@ # of distros. # Query Tcl/Tk system for library paths and version string + def getoutput(s): + ret = os.popen(s).read().strip() + return ret try: - tcl_lib_dir, tk_lib_dir, tk_ver = self.query_tcltk() + pkg_config_libs = getoutput('pkg-config --libs-only-L tk').split() + # drop '-L' part of strings + pkg_config_libs = [s[2:] for s in pkg_config_libs] + pkg_config_ver = getoutput('pkg-config --modversion tk') + tk_ver = re.match(r"(\d+.\d+)[\d.]*", pkg_config_ver).group(1) + tcl_lib_dir = next(s for s in pkg_config_libs + if re.match(r".*-tcl-.*", s)) + '/tcl' + tk_ver + tk_lib_dir = next(s for s in pkg_config_libs + if re.match(r".*-tk-.*", s)) + '/tk' + tk_ver except: tk_ver = '' result = self.hardcoded_tcl_config() x/log/doc/he-config-bare-bones.scm'>
path: root/doc/he-config-bare-bones.scm
AgeCommit message (Expand)Author
2022-06-10doc: Update example of a minimalistic home environment....* doc/he-config-bare-bones.scm: Adujst example according to changes in bash-service-type and home-files-service-type. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Andrew Tropin
2021-10-09Move (gnu home-services) to (gnu home services)....* gnu/home-services.scm (%guix-home-root-directory): Replace gnu/home-services.scm with "gnu/home/services.scm". Rename to gnu/home/services.scm. * gnu/local.mk (GNU_SYSTEM_MODULES): Rename gnu/home-services.scm to gnu/home/services.scm. * doc/he-config-bare-bones.scm: Replace (gnu home-services) with (gnu home services). * gnu/home.scm: Same. * gnu/home/services/fontutils.scm: Same. * gnu/home/services/mcron.scm: Same. * gnu/home/services/shells.scm: Same. * gnu/home/services/shepherd.scm: Same. * gnu/home/services/symlink-manager.scm: Same. * gnu/home/services/xdg.scm: Same. * guix/scripts/home.scm: Same. * guix/self.scm: Same. Oleg Pykhalov
2021-10-08gnu: Move (gnu home-services) to (gnu home services)....* gnu/home-services/configuration.scm: Move the content ... * gnu/home/services/configuration.scm: ... here. * doc/guix.texi: Replace (gnu home-services mcron) with (gnu home services mcron). Replace (gnu home-services) with (gnu home services). * gnu/home.scm: Replace (gnu home-services fontutils) with (gnu services fontutils). Replace (gnu home-services shells) with (gnu home services shells). Replace (gnu home-services symlink-manager) with (gnu home services symlink-manager). Replace (gnu home-services xdg) with (gnu home services xdg). * gnu/home-services/fontutils.scm: Rename to gnu/services/fontutils.scm. * gnu/home-services/mcron.scm: Move to gnu/home/services/mcron.scm. Replace (gnu home-services shepherd) with (gnu home services shepherd). * gnu/home-services.scm (%service-type-path): Search home services in "gnu/services". * gnu/home-services/shells.scm: Replace (gnu home-services configuration) with (gnu home services configuration). Rename to gnu/home/services/shells.scm. Replace (gnu home-services utils) with (gnu home services utils). * gnu/home-services/shepherd.scm: Move to gnu/home/services/shepherd.scm. * gnu/home-services/symlink-manager.scm: Rename to gnu/home/services/symlink-manager.scm. * gnu/home-services/utils.scm: Rename to gnu/home/services/utils.scm. * gnu/home-services/xdg.scm: Rename to gnu/home/services/xdg.scm. * guix/scripts/home/import.scm: Replace (gnu home-services bash) with (gnu home services bash). * gnu/home-services.scm: Update documentation string. * doc/he-config-bare-bones.scm: Apply new (gnu home-services ...) modules location. * gnu/local.mk (GNU_SYSTEM_MODULES): Same. Oleg Pykhalov
2021-09-09doc: Add Guix Home documentation....* doc/guix.texi: Add Guix Home documentation. * doc/he-config-bare-bones.scm: New file. Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com> Andrew Tropin