diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2025-06-14 21:44:27 +0200 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2025-06-20 15:05:01 +0100 |
| commit | c7ed523b1ebafa9064cc7ac1e9a0ee128c911082 (patch) | |
| tree | e7b6e262c4fa7f0fdc1d16ec542147483e50cb25 | |
| parent | 3c78bbab6367c5c0bdf98105f5c148428575c8b5 (diff) | |
gnu: scons-3: Improve style.
* gnu/packages/build-tools.scm (scons-3): Improve style.
[source]: Run guix style.
[arguments]: Rewrite using gexps.
Change-Id: Ie69e7c59601f18915713e29197c345662b54dfc4
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
| -rw-r--r-- | gnu/packages/build-tools.scm | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index be33e0dc50..008f59bfe5 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -572,31 +572,31 @@ software.") (package (inherit scons) (version "3.0.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/SCons/scons") - (commit version))) - (file-name (git-file-name "scons" version)) - (sha256 - (base32 - "1xy8jrwz87y589ihcld4hv7wn122sjbz914xn8h50ww77wbhk8hn")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SCons/scons") + (commit version))) + (file-name (git-file-name "scons" version)) + (sha256 + (base32 "1xy8jrwz87y589ihcld4hv7wn122sjbz914xn8h50ww77wbhk8hn")))) (arguments - `(#:use-setuptools? #f ; still relies on distutils - #:tests? #f ; no 'python setup.py test' command - #:phases - (modify-phases %standard-phases - (add-before 'build 'bootstrap - (lambda _ - (substitute* "src/engine/SCons/compat/__init__.py" - (("sys.modules\\[new\\] = imp.load_module\\(old, \\*imp.find_module\\(old\\)\\)") - "sys.modules[new] = __import__(old)")) - (substitute* "src/engine/SCons/Platform/__init__.py" - (("mod = imp.load_module\\(full_name, file, path, desc\\)") - "mod = __import__(full_name)")) - (invoke "python" "bootstrap.py" "build/scons" "DEVELOPER=guix") - (chdir "build/scons") - #t))))) + (list + #:use-setuptools? #f ; still relies on distutils + #:tests? #f ; no 'python setup.py test' command + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'bootstrap + (lambda _ + (substitute* "src/engine/SCons/compat/__init__.py" + (("sys.modules\\[new\\] = imp.load_module\\(old, \\*imp.find_module\\(old\\)\\)") + "sys.modules[new] = __import__(old)")) + (substitute* "src/engine/SCons/Platform/__init__.py" + (("mod = imp.load_module\\(full_name, file, path, desc\\)") + "mod = __import__(full_name)")) + (invoke "python" "bootstrap.py" "build/scons" "DEVELOPER=guix") + (chdir "build/scons")))))) (native-inputs '()))) (define-public scons-python2 |