diff options
| author | Elliot Cameron <nixpkgs-commits@deshaw.com> | 2023-04-24 23:39:59 -0400 |
|---|---|---|
| committer | Elliot Cameron <nixpkgs-commits@deshaw.com> | 2023-07-26 16:11:54 -0400 |
| commit | 85888a1298b3560579a3f5e98995c7e66e210fc9 (patch) | |
| tree | 9d3b076d639f9e26445daeee2d7a3a167aa9d3bd | |
| parent | 6ba492309955660d400e13d45dc3b35da7ed3943 (diff) | |
| download | nixpkgs-85888a1298b3560579a3f5e98995c7e66e210fc9.tar nixpkgs-85888a1298b3560579a3f5e98995c7e66e210fc9.tar.gz nixpkgs-85888a1298b3560579a3f5e98995c7e66e210fc9.tar.bz2 nixpkgs-85888a1298b3560579a3f5e98995c7e66e210fc9.tar.lz nixpkgs-85888a1298b3560579a3f5e98995c7e66e210fc9.tar.xz nixpkgs-85888a1298b3560579a3f5e98995c7e66e210fc9.tar.zst nixpkgs-85888a1298b3560579a3f5e98995c7e66e210fc9.zip | |
tclap: add 1.4 variant
| -rw-r--r-- | pkgs/development/libraries/tclap/1.2.nix (renamed from pkgs/development/libraries/tclap/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/libraries/tclap/1.4.nix | 48 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 53 insertions, 1 deletions
diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/1.2.nix index cdb2b519329..cdb2b519329 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/1.2.nix diff --git a/pkgs/development/libraries/tclap/1.4.nix b/pkgs/development/libraries/tclap/1.4.nix new file mode 100644 index 00000000000..7a0b5765963 --- /dev/null +++ b/pkgs/development/libraries/tclap/1.4.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchgit +, cmake +, doxygen +, python3 +}: +stdenv.mkDerivation { + pname = "tclap"; + + # This version is slightly newer than 1.4.0-rc1: + # See https://github.com/mirror/tclap/compare/1.4.0-rc1..3feeb7b2499b37d9cb80890cadaf7c905a9a50c6 + version = "1.4-3feeb7b"; + + src = fetchgit { + url = "git://git.code.sf.net/p/tclap/code"; + rev = "3feeb7b2499b37d9cb80890cadaf7c905a9a50c6"; # 1.4 branch + hash = "sha256-byLianB6Vf+I9ABMmsmuoGU2o5RO9c5sMckWW0F+GDM="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '$'{CMAKE_INSTALL_LIBDIR_ARCHIND} '$'{CMAKE_INSTALL_LIBDIR} + substituteInPlace packaging/pkgconfig.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + + nativeBuildInputs = [ + cmake + doxygen + python3 + ]; + + # Installing docs is broken in this package+version so we stub out some files + preInstall = '' + touch docs/manual.html + ''; + + doCheck = true; + + meta = with lib; { + description = "Templatized C++ Command Line Parser Library (v1.4)"; + homepage = "https://tclap.sourceforge.net/"; + license = licenses.mit; + maintainers = teams.deshaw.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 523be31c5a0..38c00cfc82b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24858,7 +24858,11 @@ with pkgs; taskflow = callPackage ../development/libraries/taskflow { }; - tclap = callPackage ../development/libraries/tclap { }; + tclap = tclap_1_2; + + tclap_1_2 = callPackage ../development/libraries/tclap/1.2.nix { }; + + tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { }; tcllib = callPackage ../development/libraries/tcllib { }; |