From fff893fe6325d0320cc9abbcfe0ea50d838b550c Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Tue, 13 Jan 2026 15:17:11 +0100 Subject: [PATCH] draco: move to pkgs/by-name this shouldn't create any rebuilds --- .../draco/default.nix => by-name/dr/draco/package.nix} | 3 ++- pkgs/{development/libraries => by-name/dr}/draco/tinygltf.nix | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) rename pkgs/{development/libraries/draco/default.nix => by-name/dr/draco/package.nix} (96%) rename pkgs/{development/libraries => by-name/dr}/draco/tinygltf.nix (100%) diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/by-name/dr/draco/package.nix similarity index 96% rename from pkgs/development/libraries/draco/default.nix rename to pkgs/by-name/dr/draco/package.nix index d165b96ea1e3..24352556e86a 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/by-name/dr/draco/package.nix @@ -1,5 +1,6 @@ { lib, + callPackage, stdenv, fetchFromGitHub, nix-update-script, @@ -10,11 +11,11 @@ withTranscoder ? true, eigen, ghc_filesystem, - tinygltf, }: let cmakeBool = b: if b then "ON" else "OFF"; + tinygltf = callPackage ./tinygltf.nix { }; in stdenv.mkDerivation (finalAttrs: { version = "1.5.7"; diff --git a/pkgs/development/libraries/draco/tinygltf.nix b/pkgs/by-name/dr/draco/tinygltf.nix similarity index 100% rename from pkgs/development/libraries/draco/tinygltf.nix rename to pkgs/by-name/dr/draco/tinygltf.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0614a500516..bf52a865aea1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6682,10 +6682,6 @@ with pkgs; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; db62 = callPackage ../development/libraries/db/db-6.2.nix { }; - draco = callPackage ../development/libraries/draco { - tinygltf = callPackage ../development/libraries/draco/tinygltf.nix { }; - }; - # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux)