summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-10-22 20:52:59 +0200
committerRicardo Wurmus <rekado@elephly.net>2019-10-23 10:10:43 +0200
commiteb252faef806b146908060f917d3effdb4eba245 (patch)
tree551ac1f9cea8efff1cd861e00e27a7da162bf519
parentb926e7866cd4d49364d9132e6a7f5431967cd39a (diff)
Adjust instructions for building development version.
* README.org: Adjust build instructions. * guix/rekado/guile-studio.scm (guile-studio): Rename package to "guile-studio-devel".
-rw-r--r--README.org6
-rw-r--r--guix/rekado/guile-studio.scm14
2 files changed, 12 insertions, 8 deletions
diff --git a/README.org b/README.org
index 51291d0..371ae38 100644
--- a/README.org
+++ b/README.org
@@ -11,10 +11,8 @@ to create yet another “prelude” or starter pack for general use of
Emacs. Instead the only goal is to hide Emacs quirks and provide a
pleasant Guile + Geiser experience out of the box.
-To install it try this:
+To build Guile Studio from source with Guix and run it try this:
git clone https://git.elephly.net/software/guile-studio.git
cd guile-studio
- guix package -L guix -i guile-studio
-
-Run “guile-studio” to start it.
+ $(guix build -L guix guile-studio-devel)/bin/guile-studio
diff --git a/guix/rekado/guile-studio.scm b/guix/rekado/guile-studio.scm
index 8e555bf..ca14a1e 100644
--- a/guix/rekado/guile-studio.scm
+++ b/guix/rekado/guile-studio.scm
@@ -10,17 +10,22 @@
(gnu packages emacs-xyz)
(gnu packages gnome))
+
+;;; XXX big bad hack...
+(system* "tar" "-cf" "/tmp/guile-studio.tar"
+ "--exclude-vcs" "--exclude" "guix"
+ "-C" "/home/rekado/dev/" "guile-studio")
+
(define-public guile-studio
(package
- (name "guile-studio")
+ (name "guile-studio-devel")
(version "0")
- (source (local-file "../../guile-studio-configure.scm"))
+ (source "/tmp/guile-studio.tar")
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; there are none
#:phases
(modify-phases %standard-phases
- (delete 'unpack)
(delete 'configure)
(replace 'build
(lambda* (#:key source inputs outputs #:allow-other-keys)
@@ -29,7 +34,8 @@
(share (string-append out "/share/")))
(mkdir-p share)
(mkdir-p bin)
- (apply invoke "guile" "-s" source
+ (apply invoke "guile" "-s"
+ "guile-studio-configure.scm"
out
(assoc-ref inputs "emacs")
(assoc-ref inputs "guile-picture-language")