From 4137dbc2737384c4cc9e2b5d3c4cfc6ba6e5f0cc Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Sun, 25 Jun 2023 00:16:24 +0300
Subject: [PATCH] tinygltf: inline in draco

This is a header-only library whose only user is draco. Inline it in the draco
package since there are no other users and upgrading it to 2.8.8 breaks the draco
build.
---
 pkgs/development/libraries/draco/default.nix                | 6 +++---
 .../libraries/{tinygltf/default.nix => draco/tinygltf.nix}  | 0
 pkgs/top-level/aliases.nix                                  | 1 +
 pkgs/top-level/all-packages.nix                             | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename pkgs/development/libraries/{tinygltf/default.nix => draco/tinygltf.nix} (100%)

diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix
index 4b02b11b3d2..1cc8a843dcd 100644
--- a/pkgs/development/libraries/draco/default.nix
+++ b/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/pkgs/development/libraries/tinygltf/default.nix b/pkgs/development/libraries/draco/tinygltf.nix
similarity index 100%
rename from pkgs/development/libraries/tinygltf/default.nix
rename to pkgs/development/libraries/draco/tinygltf.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4553ba96dee..3537726c85f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1677,6 +1677,7 @@ mapAliases ({
   timescale-prometheus = promscale; # Added 2020-09-29
   timedoctor = throw "'timedoctor' has been removed from nixpkgs"; # Added 2022-10-09
   timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05
+  tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25
   tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17
   tkcvs = tkrev; # Added 2022-03-07
   togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00c67b87bd7..25aa16c4202 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13211,8 +13211,6 @@ with pkgs;
 
   tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { };
 
-  tinygltf = callPackage ../development/libraries/tinygltf { };
-
   tinyobjloader = callPackage ../development/libraries/tinyobjloader { };
 
   tinyprog = callPackage ../development/embedded/fpga/tinyprog { };
@@ -20416,7 +20414,9 @@ with pkgs;
 
   dotconf = callPackage ../development/libraries/dotconf { };
 
-  draco = callPackage ../development/libraries/draco { };
+  draco = callPackage ../development/libraries/draco {
+    tinygltf = callPackage ../development/libraries/draco/tinygltf.nix { };
+  };
 
   # Multi-arch "drivers" which we want to build for i686.
   driversi686Linux = recurseIntoAttrs {