From 7a67e2c95c4a711af1a22be43e29acee15867ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 31 Oct 2026 11:31:23 +0100 Subject: [PATCH] tpm2-tss: move to by-name The dropped `buildPackages` part - I don't think it's needed. We normally put autoreconfHook into nativeBuildInputs without any other tweaks. --- .../tp}/tpm2-tss/no-dynamic-loader-path.patch | 0 .../tpm2-tss/default.nix => by-name/tp/tpm2-tss/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{development/libraries => by-name/tp}/tpm2-tss/no-dynamic-loader-path.patch (100%) rename pkgs/{development/libraries/tpm2-tss/default.nix => by-name/tp/tpm2-tss/package.nix} (99%) diff --git a/pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch b/pkgs/by-name/tp/tpm2-tss/no-dynamic-loader-path.patch similarity index 100% rename from pkgs/development/libraries/tpm2-tss/no-dynamic-loader-path.patch rename to pkgs/by-name/tp/tpm2-tss/no-dynamic-loader-path.patch diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/by-name/tp/tpm2-tss/package.nix similarity index 99% rename from pkgs/development/libraries/tpm2-tss/default.nix rename to pkgs/by-name/tp/tpm2-tss/package.nix index 2ce11dcab64b..49ce25505438 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/by-name/tp/tpm2-tss/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitHub, - autoreconfHook, + autoreconfHook269, autoconf-archive, pkg-config, doxygen, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - autoreconfHook + autoreconfHook269 autoconf-archive pkg-config doxygen diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf425cfddd5f..ca4203843387 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6456,10 +6456,6 @@ with pkgs; tk-9_1 ; - tpm2-tss = callPackage ../development/libraries/tpm2-tss { - autoreconfHook = buildPackages.autoreconfHook269; - }; - unixodbcDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { }); valeStyles = recurseIntoAttrs (callPackages ../by-name/va/vale/styles.nix { });