Merge pull request #277951 from atorres1985-contrib/adopt-tinyxml

tinyxml: adopted by AndersonTorres
This commit is contained in:
Thiago Kenji Okada 2024-01-08 17:50:53 +00:00 committed by GitHub
commit 08883ba09e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 32 deletions

View File

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation (finalAttrs: {
pname = "tinyxml2";
version = "10.0.0";
src = fetchFromGitHub {
owner = "leethomason";
repo = "tinyxml2";
rev = finalAttrs.version;
hash = "sha256-9xrpPFMxkAecg3hMHzzThuy0iDt970Iqhxs57Od+g2g=";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [
# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR
# correctly (setting it to an absolute path causes include files to go to
# $out/$out/include, because the absolute path is interpreted with root at
# $out).
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_LIBDIR=lib"
];
meta = {
description = "A simple, small, efficient, C++ XML parser";
homepage = "https://github.com/leethomason/tinyxml2";
changelog = "https://github.com/leethomason/tinyxml2/releases/tag/${finalAttrs.src.rev}";
license = with lib.licenses; [ zlib ];
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
};
})

View File

@ -1,30 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "tinyxml-2";
version = "10.0.0";
src = fetchFromGitHub {
repo = "tinyxml2";
owner = "leethomason";
rev = version;
sha256 = "sha256-9xrpPFMxkAecg3hMHzzThuy0iDt970Iqhxs57Od+g2g=";
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [
# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
# (setting it to an absolute path causes include files to go to $out/$out/include,
# because the absolute path is interpreted with root at $out).
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_LIBDIR=lib"
];
meta = {
description = "A simple, small, efficient, C++ XML parser";
homepage = "https://www.grinninglizard.com/tinyxml2/index.html";
platforms = lib.platforms.unix;
license = lib.licenses.zlib;
};
}

View File

@ -25344,8 +25344,6 @@ with pkgs;
tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { };
tiscamera = callPackage ../os-specific/linux/tiscamera { };
tivodecode = callPackage ../applications/video/tivodecode { };