diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-12-19 01:42:40 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-12-19 01:42:40 +0100 |
| commit | 32cd878be0bb7e153fcaa6f3bfa2632867390ff9 (patch) | |
| tree | fc1ff93949817c9d172c84d0410ac9225cad57ae /gnu/packages/shells.scm | |
| parent | 753425610274ccb59cce13490c096027c61621d0 (diff) | |
| parent | 98bd11cfe7b931e9c6d6bf002a8a225fb7a1025b (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/shells.scm')
| -rw-r--r-- | gnu/packages/shells.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 1f076999cb..343f50d6d7 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -511,11 +511,11 @@ Its features include: (license bsd-2)))) (define-public s-shell - (let ((commit "6604341edb3a775ff94415762af3ee9bd86bfb3c") - (revision "1")) + (let ((commit "da2e5c20c0c5f477ec3426dc2584889a789b1659") + (revision "2")) (package (name "s-shell") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -525,13 +525,15 @@ Its features include: (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1075cml6dl15d770j3m12yz90cjacsdslbv3gank1nxd76vmpdcr")))) + "0qiny71ww5nhzy4mnc8652hn0mlxyb67h333gbdxp4j4qxsi13q4")))) (build-system gnu-build-system) (inputs `(("linenoise" ,linenoise))) (arguments `(#:tests? #f - #:make-flags (list "CC=gcc") + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" + (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'install-directory-fix |