From 3c6423d3211c8d1354a23bd230a73d4452ab1cc4 Mon Sep 17 00:00:00 2001 From: wnklmnn Date: Fri, 19 May 2023 02:33:35 +0200 Subject: [PATCH] crossfire-server: Use python39 instead of python3 (#232282) Apperently the parser used by crossfire was remove in python 3.10. https://bugs.python.org/issue40939 --- pkgs/games/crossfire/crossfire-server.nix | 25 ++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/games/crossfire/crossfire-server.nix b/pkgs/games/crossfire/crossfire-server.nix index f99e08a5a46f..9827aa76c526 100644 --- a/pkgs/games/crossfire/crossfire-server.nix +++ b/pkgs/games/crossfire/crossfire-server.nix @@ -1,6 +1,21 @@ -{ stdenv, lib, fetchsvn, autoreconfHook, - autoconf, automake, libtool, flex, perl, check, pkg-config, python3, - version, rev, sha256, maps, arch }: +{ stdenv +, lib +, fetchsvn +, autoreconfHook +, autoconf +, automake +, libtool +, flex +, perl +, check +, pkg-config +, python39 # crossfire-server relies on a parser wich was removed in python >3.9 +, version +, rev +, sha256 +, maps +, arch +}: stdenv.mkDerivation rec { pname = "crossfire-server"; @@ -12,7 +27,7 @@ stdenv.mkDerivation rec { rev = "r${rev}"; }; - nativeBuildInputs = [ autoconf automake libtool flex perl check pkg-config python3 ]; + nativeBuildInputs = [ autoconf automake libtool flex perl check pkg-config python39 ]; hardeningDisable = [ "format" ]; preConfigure = '' @@ -21,7 +36,7 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - configureFlags = [ "--with-python=${python3}" ]; + configureFlags = [ "--with-python=${python39}" ]; postInstall = '' ln -s ${maps} "$out/share/crossfire/maps"