colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tinygltf: inline in draco

Browse Source 
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.
This commit is contained in:
Jan Solanti 2023-06-25 00:16:24 +03:00 committed by Anderson Torres
parent e38e4cd6b9
commit 4137dbc273
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/draco/default.nix
View File

@ -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;
};
}
})

0
pkgs/development/libraries/tinygltf/default.nix → pkgs/development/libraries/draco/tinygltf.nix
View File

1
pkgs/top-level/aliases.nix
View File

@ -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

6
pkgs/top-level/all-packages.nix
View File

@ -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 {