summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-01-31 18:45:59 +0100
committerGitHub <noreply@github.com>2021-01-31 18:45:59 +0100
commit27df874f0744d9552207c911d7a10b6140a8ca08 (patch)
tree5ae1ceb2db6f3f501484b9d3e0bde4dd7fa34938
parent09feb4b90a55b2a401a88df4d6ea0a15ff116335 (diff)
parentc4d9c37cb7885b411e6bbe8c4244bff7230a6659 (diff)
Merge pull request #110441 from spease/cxxopts
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--pkgs/development/libraries/cxxopts/default.nix27
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 35 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cdc036823b44..a7313e8fdfae 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8661,6 +8661,12 @@
githubId = 7669898;
name = "Katharina Fey";
};
+ spease = {
+ email = "peasteven@gmail.com";
+ github = "spease";
+ githubId = 2825204;
+ name = "Steven Pease";
+ };
spencerjanssen = {
email = "spencerjanssen@gmail.com";
github = "spencerjanssen";
diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix
new file mode 100644
index 000000000000..ddbc845e3b49
--- /dev/null
+++ b/pkgs/development/libraries/cxxopts/default.nix
@@ -0,0 +1,27 @@
+{ cmake, fetchFromGitHub, icu, lib, pkg-config, stdenv, enableUnicodeHelp ? true }:
+
+stdenv.mkDerivation rec {
+ name = "cxxopts";
+ version = "2.2.1";
+
+ src = fetchFromGitHub {
+ owner = "jarro2783";
+ repo = name;
+ rev = "v${version}";
+ sha256 = "0d3y747lsh1wkalc39nxd088rbypxigm991lk3j91zpn56whrpha";
+ };
+
+ buildInputs = lib.optional enableUnicodeHelp [ icu.dev ];
+ cmakeFlags = lib.optional enableUnicodeHelp [ "-DCXXOPTS_USE_UNICODE_HELP=TRUE" ];
+ nativeBuildInputs = [ cmake ] ++ lib.optional enableUnicodeHelp [ pkg-config ];
+
+ doCheck = true;
+
+ meta = with lib; {
+ homepage = "https://github.com/jarro2783/cxxopts";
+ description = "Lightweight C++ GNU-style option parser library";
+ license = licenses.mit;
+ maintainers = [ maintainers.spease ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2a30e283151..c67d1338c72c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13337,6 +13337,8 @@ in
cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { };
+ cxxopts = callPackage ../development/libraries/cxxopts { };
+
cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { };
cypress = callPackage ../development/web/cypress { };