logistic-bot/nix-doom-emacs-unstraightened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make org aware of its release version

Browse source 
This fixes version checks against Org, like the one elfeed runs after
loading Org.
This commit is contained in:
Marien Zwart 2024-04-07 22:04:45 +10:00
parent b6cd4a3794
commit 6136bc10ab
No known key found for this signature in database
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
elisp-packages.nix
View file

@ -39,8 +39,6 @@
# This does not hit the same dependency problem auctex does because org is a # This does not hit the same dependency problem auctex does because org is a
# built-in package, and the package.el machinery assumes that satisfies the # built-in package, and the package.el machinery assumes that satisfies the
# dependency (it is not aware of our shadowing it). # dependency (it is not aware of our shadowing it).
#
# TODO: pass in ORGVERSION / GITVERSION (or provide a .git dir).
org = esuper.trivialBuild { org = esuper.trivialBuild {
pname = "org"; pname = "org";
version = "1"; version = "1";
@ -52,9 +50,13 @@
# XXX this sticks stuff in $out/emacs/etc/org (datadir in default.mk) # XXX this sticks stuff in $out/emacs/etc/org (datadir in default.mk)
# that probably needs to go somewhere else. # that probably needs to go somewhere else.
# Possibly same for $out/share/info/. # Possibly same for $out/share/info/.
# Finding ORGVERSION is a hack (based on the one in Doom).
# TODO: set GITVERSION?
configurePhase = '' configurePhase = ''
echo "prefix = $out" > local.mk echo "prefix = $out" > local.mk
echo "lispdir = $out/share/emacs/site-lisp/org" >> local.mk echo "lispdir = $out/share/emacs/site-lisp/org" >> local.mk
echo "ORGVERSION = $(sed -ne 's/^;; Version: \([^\n-]\+\).*/\1/p' lisp/org.el)" >> local.mk
make config make config
''; '';
buildPhase = '' buildPhase = ''