emilytrau/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Simplify build by including nlohmann/json.hpp

Browse source
This commit is contained in:
Eelco Dolstra 2017-12-04 17:07:26 +01:00
parent f1efb97075
commit 7f2c324ed1
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 14724 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
local.mk
View file

@ -3,7 +3,7 @@ ifeq ($(MAKECMDGOALS), dist)
dist-files += $(shell git --git-dir=.git ls-files || find * -type f) dist-files += $(shell git --git-dir=.git ls-files || find * -type f)
endif endif
dist-files += configure config.h.in nix.spec perl/configure src/nlohmann/json.hpp dist-files += configure config.h.in nix.spec perl/configure
clean-files += Makefile.config clean-files += Makefile.config

2
release.nix
View file

@ -43,8 +43,6 @@ let
(cd perl ; autoreconf --install --force --verbose) (cd perl ; autoreconf --install --force --verbose)
# TeX needs a writable font cache. # TeX needs a writable font cache.
export VARTEXFONTS=$TMPDIR/texfonts export VARTEXFONTS=$TMPDIR/texfonts
cp -rv ${nlohmann_json}/include/nlohmann src/nlohmann
''; '';
distPhase = distPhase =

1
shell.nix
View file

@ -18,7 +18,6 @@ with import ./release-common.nix { inherit pkgs; };
customMemoryManagement = false; customMemoryManagement = false;
}) })
autoreconfHook autoreconfHook
nlohmann_json
# For nix-perl # For nix-perl
perl perl

14723
src/nlohmann/json.hpp Normal file
View file

File diff suppressed because it is too large Load diff