From eb252faef806b146908060f917d3effdb4eba245 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 22 Oct 2019 20:52:59 +0200 Subject: Adjust instructions for building development version. * README.org: Adjust build instructions. * guix/rekado/guile-studio.scm (guile-studio): Rename package to "guile-studio-devel". --- README.org | 6 ++---- guix/rekado/guile-studio.scm | 14 ++++++++++---- 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") -- cgit v1.2.3