rang: Replace with bundled version

d-SEAMS · Mar 17, 2021 · d138fb8 · d138fb8
1 parent 4e1ded2
commit d138fb8
Show file tree

Hide file tree

Showing 9 changed files with 504 additions and 53 deletions.
diff --git a/nix/default.nix b/nix/default.nix
@@ -18,8 +18,6 @@
   fmtlib = callPackage ./pkgs/fmtlib/fmt.nix { };
   # Package for testing
   yamlCpp = callPackage ./pkgs/yaml-cpp/yaml-cpp.nix { };
-  # Package for testing
-  rang = callPackage ./pkgs/rang/rang.nix { };
   # Program expression
     yodaStruct = callPackage ./yodaStruct.nix { };
   }; in

diff --git a/nix/pkgs/rang.nix b/nix/pkgs/rang.nix
diff --git a/nix/pkgs/rang/rang.nix b/nix/pkgs/rang/rang.nix
diff --git a/nix/pkgs/rang/rang.src.json b/nix/pkgs/rang/rang.src.json
diff --git a/nix/yodaStruct.nix b/nix/yodaStruct.nix
@@ -12,15 +12,13 @@
 , lib
 , boost
 , gsl
-, rang
 , cmake }:
   clangStdenv.mkDerivation {
   name = "yodaStruct";
   src = lib.cleanSource ../.;
   enableParallelBuilding=true;
   nativeBuildInputs = [
   fmtlib
-  rang
   cmake
   lua
   luaPackages.luafilesystem

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -32,8 +32,7 @@ find_package(
   "GSL" REQUIRED
   "Boost" REQUIRED COMPONENTS system filesystem
   "yaml-cpp"
-  "fmt"
-  "rang")
+  "fmt")
 
 link_directories(${Boost_LIBRARY_DIRS})
 # Link everything