diff --git a/pkgs/by-name/ti/tinyxml-2/package.nix b/pkgs/by-name/ti/tinyxml-2/package.nix new file mode 100644 index 000000000000..33ec1340528e --- /dev/null +++ b/pkgs/by-name/ti/tinyxml-2/package.nix @@ -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; + }; +}) diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix deleted file mode 100644 index 5e63893bb232..000000000000 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cde629067014..88ad87d56ac5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };