summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2021-01-03 22:32:46 +0100
committerRicardo Wurmus <rekado@elephly.net>2021-01-03 22:32:46 +0100
commit20fbca0bb5efeafc9d296125ef1ff3190a4efbae (patch)
tree1144b0cd7a79b1f40fac22370d6028bf831cc03e
parent01bd103694019ce4a00b6a3556f4e56cab6089b3 (diff)
Remove obsolete icons argument.
-rw-r--r--Makefile2
-rw-r--r--guile-studio-configure.scm7
-rw-r--r--guix/rekado/guile-studio.scm8
3 files changed, 6 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index ee0b1fe..453ebf9 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ build:
mkdir -p $(PREFIX)/bin && \
mkdir -p $(PREFIX)/share && \
guile -s guile-studio-configure.scm \
- $(PREFIX) $(EMACS_DIR) $(GUILE_DIR) $(PICT_DIR) $(ICONS_DIR) $(INPUTS)
+ $(PREFIX) $(EMACS_DIR) $(GUILE_DIR) $(PICT_DIR) $(INPUTS)
dist:
mkdir -p guile-studio && cp $(SOURCES) guile-studio && \
diff --git a/guile-studio-configure.scm b/guile-studio-configure.scm
index e149488..f337283 100644
--- a/guile-studio-configure.scm
+++ b/guile-studio-configure.scm
@@ -4,7 +4,7 @@
(srfi srfi-1)
(srfi srfi-26))
-(define (generate-configuration prefix emacsdir guiledir picture-language icons emacs-package-dirs)
+(define (generate-configuration prefix emacsdir guiledir picture-language emacs-package-dirs)
`(progn
(let ((guix-emacs.el
(expand-file-name
@@ -568,7 +568,7 @@ exec ~a/bin/emacs -mm --no-site-file --no-site-lisp --no-x-resources --no-init-f
(map (cut string-append infodir "/" <>)
(or (scandir infodir info-file?) '()))))
(match (command-line)
- ((_ prefix emacsdir guiledir picture-language icons . emacs-package-dirs)
+ ((_ prefix emacsdir guiledir picture-language . emacs-package-dirs)
(let* ((share (string-append prefix "/share"))
(datadir (string-append share "/guile-studio"))
(infodir (string-append datadir "/info")))
@@ -589,7 +589,6 @@ exec ~a/bin/emacs -mm --no-site-file --no-site-lisp --no-x-resources --no-init-f
emacsdir
guiledir
picture-language
- icons
emacs-package-dirs)
#:display? #f)))
@@ -614,7 +613,7 @@ exec ~a/bin/emacs -mm --no-site-file --no-site-lisp --no-x-resources --no-init-f
#t)
((script . _)
(format (current-error-port)
- "usage: ~a prefix emacsdir picture-language icons emacs-package-dirs ...\n"
+ "usage: ~a prefix emacsdir picture-language emacs-package-dirs ...\n"
script))))
(main)
diff --git a/guix/rekado/guile-studio.scm b/guix/rekado/guile-studio.scm
index efed5af..e676161 100644
--- a/guix/rekado/guile-studio.scm
+++ b/guix/rekado/guile-studio.scm
@@ -24,10 +24,7 @@
,@%gnu-build-system-modules)
#:tests? #f ; there are none
#:make-flags
- (list (string-append "ICONS_DIR="
- (assoc-ref %build-inputs "adwaita-icon-theme")
- "/share/icons/Adwaita/")
- (string-append "PICT_DIR="
+ (list (string-append "PICT_DIR="
(assoc-ref %build-inputs "guile-picture-language"))
(string-append "EMACS_DIR="
(assoc-ref %build-inputs "emacs"))
@@ -61,8 +58,7 @@
("emacs-ivy" ,emacs-ivy)
("emacs-flycheck" ,emacs-flycheck)
("emacs-flycheck-guile" ,emacs-flycheck-guile)
- ("emacs-paren-face" ,emacs-paren-face)
- ("adwaita-icon-theme" ,adwaita-icon-theme)))
+ ("emacs-paren-face" ,emacs-paren-face)))
(native-inputs
`(("texinfo" ,texinfo)))
(home-page "https://gnu.org/software/guile")