Merge pull request #105543 from IvarWithoutBones/tinyobjloader-init-1.0.6

This commit is contained in:
Sandro 2020-12-01 17:00:47 +01:00 committed by GitHub
commit 385ec3ebbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 0 deletions

View file

@ -0,0 +1,26 @@
{ stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "tinyobjloader";
version = "1.0.6";
src = fetchFromGitHub {
owner = "tinyobjloader";
repo = "tinyobjloader";
rev = "v${version}";
sha256 = "162168995f4xch7hm3iy6m57r8iqkpzi5x9qh1gsghlxwdxxqbis";
};
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
homepage = "https://github.com/tinyobjloader/tinyobjloader";
description = "Tiny but powerful single file wavefront obj loader";
license = licenses.mit;
maintainers = [ maintainers.ivar ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,21 @@
{ lib, buildPythonPackage, pybind11, tinyobjloader }:
buildPythonPackage rec {
pname = "tinyobjloader-py";
inherit (tinyobjloader) version src;
# Build needs headers from ${src}, setting sourceRoot or fetching from pypi won't work.
preConfigure = ''
cd python
'';
buildInputs = [ pybind11 ];
# No tests are included upstream
doCheck = false;
pythonImportsCheck = [ "tinyobjloader" ];
meta = with lib; tinyobjloader.meta // {
description = "Python wrapper for the C++ wavefront .obj loader tinyobjloader";
};
}

View file

@ -7671,6 +7671,8 @@ in
tinyfecvpn = callPackage ../tools/networking/tinyfecvpn {};
tinyobjloader = callPackage ../development/libraries/tinyobjloader { };
tinyprog = callPackage ../development/tools/misc/tinyprog { };
tinyproxy = callPackage ../tools/networking/tinyproxy {};

View file

@ -7278,6 +7278,8 @@ in {
tinydb = callPackage ../development/python-modules/tinydb { };
tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { };
tiros = callPackage ../development/python-modules/tiros { };
tissue = callPackage ../development/python-modules/tissue { };