From ea65f82e4dadca2166790ac039c456f29c3ea510 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 22 Jul 2019 03:48:29 +0200 Subject: [PATCH] Fix void doom-package-list error on first install --- core/autoload/packages.el | 2 +- core/core-packages.el | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/autoload/packages.el b/core/autoload/packages.el index 0c24d787f..2462e8c55 100644 --- a/core/autoload/packages.el +++ b/core/autoload/packages.el @@ -1,6 +1,6 @@ ;;; core/autoload/packages.el -*- lexical-binding: t; -*- -(require 'core-packages) +(require 'straight) ;; diff --git a/core/core-packages.el b/core/core-packages.el index bbcdf1abc..480efe2b7 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -142,6 +142,9 @@ necessary package metadata is initialized and available for them." (dolist (package (straight--directory-files (straight--build-dir))) (add-to-list 'load-path (directory-file-name (straight--build-dir package))))) (when (or force-p (not doom-packages)) + ;; On first install, the packages API will be unavailable + (unless (fboundp 'doom-package-list) + (load! "autoload/packages.el")) (setq doom-disabled-packages nil doom-packages (doom-package-list)) (cl-loop for (pkg . plist) in doom-packages