diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index 21a2b23f414d..22d3bd889e11 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, boost, brigand, catch2 }: - +{ stdenv, fetchFromGitHub, cmake, boost, catch2, metal }: stdenv.mkDerivation rec { pname = "fcppt"; - version = "3.2.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "freundlich"; repo = "fcppt"; rev = version; - sha256 = "09mah52m3lih2n0swpsh8qb72yzl4nixaq99xp7wxyxxprhf4bpa"; + sha256 = "045cmn4sym6ria96l4fsc1vrs8l4xrl1gzkmja82f4ddj8qkji2f"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost catch2 ]; + buildInputs = [ boost catch2 metal ]; - cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" "-DBrigand_INCLUDE_DIR=${brigand}/include" ]; + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/metal/default.nix b/pkgs/development/libraries/metal/default.nix new file mode 100644 index 000000000000..7e047c28d0a6 --- /dev/null +++ b/pkgs/development/libraries/metal/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + pname = "metal"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "brunocodutra"; + repo = "metal"; + rev = "v${version}"; + sha256 = "07n1aqyaixbd66l24km5ip3pkmidkx9m3saygf7cfp6vvbgmi42l"; + }; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Single-header C++11 library designed to make you love template metaprogramming"; + homepage = "https://github.com/brunocodutra/metal"; + license = licenses.mit; + maintainers = with maintainers; [ pmiddend ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b22a35f4f5e4..c2d2cb732121 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9040,6 +9040,7 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala = scala_2_13; + metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; scalafix = callPackage ../development/tools/scalafix { }; scalafmt = callPackage ../development/tools/scalafmt { };