From b61dd57fdcdfa47fb111a7b3247099fcfff6f5d1 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 17 Apr 2019 22:44:34 +0200 Subject: [PATCH] sublime-text: Miscellaneous improvements (#11154) - Add 3.2.1 - Reformat versions to include proper upstream version tags - Add gtk dependency - Add prefix to PATH so sublime_text can be found --- .../repos/builtin/packages/sublime-text/package.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/sublime-text/package.py b/var/spack/repos/builtin/packages/sublime-text/package.py index 102841e96c..0386d10031 100644 --- a/var/spack/repos/builtin/packages/sublime-text/package.py +++ b/var/spack/repos/builtin/packages/sublime-text/package.py @@ -13,15 +13,18 @@ class SublimeText(Package): homepage = "http://www.sublimetext.com/" url = "https://download.sublimetext.com/sublime_text_3_build_3176_x64.tar.bz2" - version('3_build_3176', '7d4c8c5167224888d901e8cbafb6ec7f') - version('3_build_3126', 'acc34252b0ea7dff1f581c5db1564dcb') - version('2.0.2', '699cd26d7fe0bada29eb1b2cd7b50e4b') + version('3.2.1.3207', 'acb64f1de024a0f004888096afa101051e48d96c7a3e7fe96e11312d524938c4') + version('3.1.1.3176', '7d4c8c5167224888d901e8cbafb6ec7f') + version('3.0.3126', 'acc34252b0ea7dff1f581c5db1564dcb') + version('2.0.2', '699cd26d7fe0bada29eb1b2cd7b50e4b') # Sublime text comes as a pre-compiled binary. # Since we can't link to Spack packages, we'll just have to # add them as runtime dependencies. # depends_on('libgobject', type='run') + depends_on('gtkplus@:2', type='run', when='@:3.1') + depends_on('gtkplus@3:', type='run', when='@3.2:') depends_on('glib', type='run') depends_on('libx11', type='run') depends_on('pcre', type='run') @@ -33,8 +36,11 @@ def url_for_version(self, version): if version[0] == 2: return "https://download.sublimetext.com/Sublime%20Text%20{0}%20x64.tar.bz2".format(version) else: - return "https://download.sublimetext.com/sublime_text_{0}_x64.tar.bz2".format(version) + return "https://download.sublimetext.com/sublime_text_{0}_build_{1}_x64.tar.bz2".format(version[0], version[-1]) def install(self, spec, prefix): # Sublime text comes as a pre-compiled binary. install_tree('.', prefix) + + def setup_environment(self, spack_env, run_env): + run_env.prepend_path('PATH', self.prefix)