Include cpptoml for build simplicity

release-common.nix

@@ -2,23 +2,6 @@
 
 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 {
   # Use "busybox-sandbox-shell" if present,
   # if not (legacy) fallback and hope it's sufficient.
@@ -69,7 +52,6 @@ rec {
       bzip2 xz brotli
       openssl pkgconfig sqlite boehmgc
       boost
-      cpptoml
 
       # Tests
       git

src/cpptoml/LICENSE

@@ -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.

src/libexpr/primops/fromTOML.cc

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