Skip to content

Commit

Permalink
Merge pull request #105543 from IvarWithoutBones/tinyobjloader-init-1…
Browse files Browse the repository at this point in the history
….0.6
  • Loading branch information
SuperSandro2000 committed Dec 1, 2020
2 parents 3958bc0 + 6f65e5c commit 385ec3e
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 0 deletions.
26 changes: 26 additions & 0 deletions pkgs/development/libraries/tinyobjloader/default.nix
@@ -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;
};
}
21 changes: 21 additions & 0 deletions pkgs/development/python-modules/tinyobjloader-py/default.nix
@@ -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";
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -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 {};
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
Expand Up @@ -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 { };
Expand Down

0 comments on commit 385ec3e

Please sign in to comment.