From c5bd862c3ad07c6c8a73c38eb399f538f3f22b34 Mon Sep 17 00:00:00 2001 From: yuuko Date: Sat, 3 Jan 2026 16:22:56 -0800 Subject: ambuild: obey 25.11 python conventions, actually use python3Packages.callPackage --- srcds-pkgs/ambuild.nix | 4 +++- srcds-pkgs/default.nix | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'srcds-pkgs') diff --git a/srcds-pkgs/ambuild.nix b/srcds-pkgs/ambuild.nix index 5621f49..2775b8f 100644 --- a/srcds-pkgs/ambuild.nix +++ b/srcds-pkgs/ambuild.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, setuptools }: let owner = "alliedmodders"; in buildPythonPackage rec { @@ -13,6 +13,8 @@ in buildPythonPackage rec { }; # doCheck = false; + pyproject = true; + build-system = [ setuptools ]; meta = with lib; { description = "Lightweight build system designed for performance and accuracy"; diff --git a/srcds-pkgs/default.nix b/srcds-pkgs/default.nix index cba167b..7914d80 100644 --- a/srcds-pkgs/default.nix +++ b/srcds-pkgs/default.nix @@ -6,9 +6,7 @@ in { libfinite = callPackage ./bad/libfinite.nix {}; mysql_5_5 = self.pkgs.pkgsi686Linux.callPackage ./bad/mysql_5_5.nix {}; - ambuild = callPackage ./ambuild.nix { - inherit (self.pkgs.python3Packages) buildPythonPackage; - }; + ambuild = self.pkgs.python3Packages.callPackage ./ambuild.nix {}; hl2sdk-2013 = callPackage ./hl2sdk-2013.nix {}; -- cgit v1.2.3