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

org: make it find its datadir

Browse source
This commit is contained in:
Marien Zwart 2024-05-11 22:58:15 +10:00
parent 1842251412
commit 1e879c9556
No known key found for this signature in database
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
elisp-packages.nix
View file

@ -61,15 +61,15 @@
}; };
buildInputs = [ ]; buildInputs = [ ];
nativeBuildInputs = [ emacs makeWrapper ]; nativeBuildInputs = [ emacs makeWrapper ];
# XXX this sticks stuff in $out/emacs/etc/org (datadir in default.mk)
# that probably needs to go somewhere else.
# Possibly same for $out/share/info/.
# Finding ORGVERSION is a hack (based on the one in Doom). # Finding ORGVERSION is a hack (based on the one in Doom).
# TODO: set GITVERSION? # TODO: set GITVERSION?
# datadir makes oc-csl find etc/csl and ox-odt find etc/styles.
# org-odt-schema-dir stays nil because it looks for od-schema*.rnc which is not installed.
# (Not sure if OpenDocument-schema-v1.3.rnc is misnamed or this file is not distributed...)
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 "datadir = $out/share/emacs/site-lisp/org/etc" >> local.mk
echo "ORGVERSION = $(sed -ne 's/^;; Version: \([^\n-]\+\).*/\1/p' lisp/org.el)" >> local.mk echo "ORGVERSION = $(sed -ne 's/^;; Version: \([^\n-]\+\).*/\1/p' lisp/org.el)" >> local.mk
make config make config
''; '';

14
flake.lock generated
View file

@ -23,11 +23,11 @@
"nixpkgs-stable": [] "nixpkgs-stable": []
}, },
"locked": { "locked": {
"lastModified": 1715046400, "lastModified": 1715418343,
"narHash": "sha256-gryLgWTbv1C4/j/6YleqQ5UmJQwa+UdkXEaemwhkGlM=", "narHash": "sha256-DieMydUZ8oZkH2jdjPv02FXTujJoJ8u0cLXQIYApX5o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "f2804916dbc4655722f743b5299b6f706335b25b", "rev": "e41288bc8adbd180681d12eb4b9274a7bae7f974",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,10 +56,10 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714971268, "lastModified": 1715218190,
"narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=",
"path": "/nix/store/p648p3av68k4h6li0126ddkznmr1mj2s-source", "path": "/nix/store/pnylamisx45d9dig55305gpq0xj2v7ki-source",
"rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a",
"type": "path" "type": "path"
}, },
"original": { "original": {