awesome-emacs/nix-doom-emacs
1
0
Fork 0
mirror of https://github.com/nix-community/nix-doom-emacs synced 2025-08-21 13:53:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that doom's customizations to straight.el take effect

Browse Source 
`nix-straight.el` used to require `straight.el` on its own before `doom`
itself was loaded. This had an unfortunate side-effect that
`straight-fix-org` was set to nil after it has been loaded so
`org-version` and `org-git-version` functions were already overloaded.
This was no problem for `org-mode` itself as it has its own overload of
the above mentioned functions, but other libraries such as `elfeed` may
also use these which causes problems.

`nix-straight.el` is updated to a version where it does not preload
`straight` and an advice is provided to `doom` so it loads our version
of `straight` when it supposed to.

References: https://github.com/vlaci/nix-doom-emacs/issues/5
This commit is contained in:
László Vaskó
2020-03-16 19:03:01 +01:00
parent 845e0847d1
commit 7add1505c0
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
advice.el
View File

@@ -17,3 +17,7 @@
;;; org is not installed from git, so no fixup is needed ;;; org is not installed from git, so no fixup is needed
(advice-add '+org-fix-package-h (advice-add '+org-fix-package-h
:override (lambda (&rest r))) :override (lambda (&rest r)))
;; just use straight provided by nix
(advice-add 'doom-ensure-straight
:override (lambda (&rest r) (require 'straight)))

8
nix/sources.json
View File

@@ -84,15 +84,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nix-straight.el": { "nix-straight.el": {
"branch": "v1.2.0", "branch": "v2.0.0",
"description": null, "description": null,
"homepage": null, "homepage": null,
"owner": "vlaci", "owner": "vlaci",
"repo": "nix-straight.el", "repo": "nix-straight.el",
"rev": "446f3d70f1816305130f307c0cf2bc8db77ed698", "rev": "b0ac8033a448c609645b4d9b5ff5f90de608f326",
"sha256": "1p4yp46kwhii8w9yf882fca9r3addn91wg6f4mv62wnkfm0i6q0f", "sha256": "1vgdjfyz8964mixwfcv30lmkjfgsmsw8vl23x1964izr2cfh2dy6",
"type": "tarball", "type": "tarball",
"url": "https://github.com/vlaci/nix-straight.el/archive/446f3d70f1816305130f307c0cf2bc8db77ed698.tar.gz", "url": "https://github.com/vlaci/nix-straight.el/archive/b0ac8033a448c609645b4d9b5ff5f90de608f326.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"org-mode": { "org-mode": {