Skip to content

Make FONTCONFIG setup for doc generation not interfere with emacs in nix-shell #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crusso merged 1 commit into from
Apr 2, 2019
Merged

Make FONTCONFIG setup for doc generation not interfere with emacs in nix-shell #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ rec {
"guide/"
"guide/Makefile"
"guide/.*css"
"guide/.*md"
"guide/.*png"
];

Expand All @@ -238,7 +239,7 @@ rec {
}; in
[ pandoc tex bash ];

FONTCONFIG_FILE =
NIX_FONTCONFIG_FILE =
with nixpkgs;
nixpkgs.makeFontsConf { fontDirectories = [ gyre-fonts inconsolata unifont lmodern lmmath ]; };

Expand Down
1 change: 1 addition & 0 deletions guide/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ TEX_OPTIONS=\
--include-in-header=<(echo '\newunicodechar{ツ}{\textrm{\textfallback{ツ}}}') \

actorscript-guide.pdf: ../design/guide.md
if [ -n "$$NIX_FONTCONFIG_FILE" ]; then export FONTCONFIG_FILE="$$NIX_FONTCONFIG_FILE"; fi; \
pandoc \
--toc \
--toc-depth 2 \
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ nixpkgs.mkShell {
default.users-guide.buildInputs ++
[ nixpkgs.ncurses ];

FONTCONFIG_FILE = default.users-guide.FONTCONFIG_FILE;
NIX_FONTCONFIG_FILE = default.users-guide.NIX_FONTCONFIG_FILE;
}