diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-01-05 23:46:45 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-01-05 23:46:45 +0100 |
| commit | b84612605204d604da84b30e56966994cc03d0a3 (patch) | |
| tree | 37dc130e19c0bc6523c14afd8b7043c2d66d26ce | |
| parent | 590e4154b683b5efc53269b1c493f48e3d862f48 (diff) | |
| download | guix-b84612605204d604da84b30e56966994cc03d0a3.tar guix-b84612605204d604da84b30e56966994cc03d0a3.tar.gz | |
gnu: lsh: Move generic patching to 'snippet'.
* gnu/packages/lsh.scm (lsh): Move generic patching to the 'snippet'
field of 'origin'.
| -rw-r--r-- | gnu/packages/lsh.scm | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/gnu/packages/lsh.scm b/gnu/packages/lsh.scm index afdf16bf55..1c823492c5 100644 --- a/gnu/packages/lsh.scm +++ b/gnu/packages/lsh.scm @@ -61,14 +61,32 @@ basis for almost any application.") (package (name "lsh") (version "2.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/lsh/lsh-" - version ".tar.gz")) - (sha256 - (base32 - "1qqjy9zfzgny0rkb27c8c7dfsylvb6n0ld8h3an2r83pmaqr9gwb")))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/lsh/lsh-" + version ".tar.gz")) + (sha256 + (base32 + "1qqjy9zfzgny0rkb27c8c7dfsylvb6n0ld8h3an2r83pmaqr9gwb")) + (modules '((guix build utils))) + (snippet + '(begin + (use-modules (guix build utils)) + + (substitute* "src/testsuite/functions.sh" + (("localhost") + ;; Avoid host name lookups since they don't work in + ;; chroot builds. + "127.0.0.1") + (("set -e") + ;; Make tests more verbose. + "set -e\nset -x")) + + (substitute* (find-files "src/testsuite" "-test$") + (("localhost") "127.0.0.1")) + + (substitute* "src/testsuite/login-auth-test" + (("/bin/cat") "cat")))))) (build-system gnu-build-system) (native-inputs `(("m4" ,m4) @@ -107,24 +125,7 @@ basis for almost any application.") sexp-conv "\"\n")))) ;; Tests rely on $USER being set. - (setenv "USER" "guix") - - (substitute* "src/testsuite/functions.sh" - (("localhost") - ;; Avoid host name lookups since they don't work in chroot - ;; builds. - "127.0.0.1") - (("set -e") - ;; Make tests more verbose. - "set -e\nset -x")) - - (substitute* (find-files "src/testsuite" "-test$") - (("localhost") "127.0.0.1")) - - (substitute* "src/testsuite/login-auth-test" - (("/bin/cat") - ;; Use the right path to `cat'. - (which "cat")))) + (setenv "USER" "guix")) %standard-phases))) (home-page "http://www.lysator.liu.se/~nisse/lsh/") (synopsis "GNU implementation of the Secure Shell (ssh) protocols") |