diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4dc3eec884d0..931040ad8902 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8910,6 +8910,12 @@ githubId = 421510; name = "NoƩ Rubinstein"; }; + photex = { + email = "photex@gmail.com"; + github = "photex"; + githubId = 301903; + name = "Chip Collier"; + }; phreedom = { email = "phreedom@yandex.ru"; github = "phreedom"; diff --git a/pkgs/development/libraries/cpptoml/default.nix b/pkgs/development/libraries/cpptoml/default.nix new file mode 100644 index 000000000000..a3528444c6a1 --- /dev/null +++ b/pkgs/development/libraries/cpptoml/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, cmake, libcxxCmakeModule ? false }: + +stdenv.mkDerivation rec { + pname = "cpptoml"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "skystrife"; + repo = "cpptoml"; + rev = "fededad7169e538ca47e11a9ee9251bc361a9a65"; + sha256 = "0zlgdlk9nsskmr8xc2ajm6mn1x5wz82ssx9w88s02icz71mcihrx"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + # If this package is built with clang it will attempt to + # use libcxx via the Cmake find_package interface. + # The default libcxx stdenv in llvmPackages doesn't provide + # this and so will fail. + "-DENABLE_LIBCXX=${if libcxxCmakeModule then "ON" else "OFF"}" + "-DCPPTOML_BUILD_EXAMPLES=OFF" + ]; + + outputs = [ "out" ]; + + meta = with lib; { + description = "C++ TOML configuration library"; + homepage = "https://github.com/skystrife/cpptoml"; + license = licenses.mit; + maintainers = with maintainers; [ photex ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 003de08a4ce6..171e7f110b47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1569,6 +1569,8 @@ with pkgs; cozy = callPackage ../applications/audio/cozy { }; + cpptoml = callPackage ../development/libraries/cpptoml { }; + cpuid = callPackage ../os-specific/linux/cpuid { }; msr = callPackage ../os-specific/linux/msr { };