From f48e290360c00a4105648e75acc956374192959f Mon Sep 17 00:00:00 2001 From: MitchMarq42 Date: Tue, 1 Nov 2022 14:15:05 -0800 Subject: [PATCH] Fiddle with broken elpaca stuff again --- init.el | 3 ++- lisp/elpaca-bootstrap.el | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index 2c36e90..4f45f0d 100644 --- a/init.el +++ b/init.el @@ -64,7 +64,8 @@ (defvar bootstrap-version) (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) (bootstrap-version 5)) (unless (file-exists-p bootstrap-file) (with-current-buffer (url-retrieve-synchronously "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" 'silent 'inhibit-cookies) (goto-char (point-max)) (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) (straight-use-package 'use-package) (setq straight-use-package-by-default t) ;; actually, use elpaca instead - ;; (require 'elpaca-bootstrap) (elpaca 'use-package (require 'use-package)) + ;; (require 'elpaca-bootstrap) (elpaca use-package (require 'use-package)) + ;; actually, don't because it's broken on Windows (require 'mitch-packages) diff --git a/lisp/elpaca-bootstrap.el b/lisp/elpaca-bootstrap.el index cfebb16..2f19d9a 100644 --- a/lisp/elpaca-bootstrap.el +++ b/lisp/elpaca-bootstrap.el @@ -6,8 +6,9 @@ ;;; Code: (declare-function elpaca-generate-autoloads "elpaca") (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) +(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) (when-let ((elpaca-repo (expand-file-name "repos/elpaca/" elpaca-directory)) - (elpaca-build (expand-file-name "builds/elpaca/" elpaca-directory)) + (elpaca-build (expand-file-name "elpaca/" elpaca-builds-directory)) (elpaca-target (if (file-exists-p elpaca-build) elpaca-build elpaca-repo)) (elpaca-url "https://www.github.com/progfolio/elpaca.git") ((add-to-list 'load-path elpaca-target))