Include cpptoml for build simplicity

This commit is contained in:
Eelco Dolstra 2018-07-03 18:21:12 +02:00
parent 3b1f54cf06
commit ea3c9dab5f
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 3476 additions and 19 deletions

View file

@ -2,23 +2,6 @@
with pkgs; with pkgs;
let
cpptoml = runCommand "cpptoml"
{ src = fetchFromGitHub {
owner = "skystrife";
repo = "cpptoml";
rev = "43d7d8e52de149fd84aedf7eb71814ff9e6b2f7e";
sha256 = "0gdxk1mj5hpj93df1kwfl903w06nihbb1ayr3x336775jm2d2cw6";
};
}
''
mkdir -p $out/include
cp $src/include/cpptoml.h $out/include/
'';
in
rec { rec {
# Use "busybox-sandbox-shell" if present, # Use "busybox-sandbox-shell" if present,
# if not (legacy) fallback and hope it's sufficient. # if not (legacy) fallback and hope it's sufficient.
@ -69,7 +52,6 @@ rec {
bzip2 xz brotli bzip2 xz brotli
openssl pkgconfig sqlite boehmgc openssl pkgconfig sqlite boehmgc
boost boost
cpptoml
# Tests # Tests
git git

18
src/cpptoml/LICENSE Normal file
View file

@ -0,0 +1,18 @@
Copyright (c) 2014 Chase Geigle
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

3457
src/cpptoml/cpptoml.h Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,7 +1,7 @@
#include "primops.hh" #include "primops.hh"
#include "eval-inline.hh" #include "eval-inline.hh"
#include <cpptoml.h> #include "cpptoml/cpptoml.h"
namespace nix { namespace nix {