about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/draco
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/draco')
-rw-r--r--nixpkgs/pkgs/development/libraries/draco/default.nix6
-rw-r--r--nixpkgs/pkgs/development/libraries/draco/tinygltf.nix30
2 files changed, 33 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/draco/default.nix b/nixpkgs/pkgs/development/libraries/draco/default.nix
index 4b02b11b3d23..1cc8a843dcd5 100644
--- a/nixpkgs/pkgs/development/libraries/draco/default.nix
+++ b/nixpkgs/pkgs/development/libraries/draco/default.nix
@@ -15,14 +15,14 @@
 let
   cmakeBool = b: if b then "ON" else "OFF";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "1.5.6";
   pname = "draco";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "draco";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-2YQMav0JJMbJ2bvnN/Xv90tjE/OWLbrZDO4WlaOvcfI=";
     fetchSubmodules = true;
   };
@@ -59,4 +59,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ jansol ];
     platforms = platforms.all;
   };
-}
+})
diff --git a/nixpkgs/pkgs/development/libraries/draco/tinygltf.nix b/nixpkgs/pkgs/development/libraries/draco/tinygltf.nix
new file mode 100644
index 000000000000..4f965c653850
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/draco/tinygltf.nix
@@ -0,0 +1,30 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, nix-update-script
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  version = "2.8.7";
+  pname = "tinygltf";
+
+  src = fetchFromGitHub {
+    owner = "syoyo";
+    repo = "tinygltf";
+    rev = "v${version}";
+    hash = "sha256-uQlv+mUWnqUJIXnPf2pVuRg1akcXAfqyBIzPPmm4Np4=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Header only C++11 tiny glTF 2.0 library";
+    homepage = "https://github.com/syoyo/tinygltf";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jansol ];
+    platforms = platforms.all;
+  };
+}