From 0f8342b5f490334c96e2f2984c089a6d21b01032 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Fri, 4 Apr 2025 15:15:34 +0200 Subject: [PATCH] mkosi: rename python3 -> python --- pkgs/tools/virtualization/mkosi/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index 6f2fdc6eefe4..1163a909fec3 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, stdenv, + python, systemd, pandoc, kmod, @@ -15,13 +16,11 @@ replaceVars, # Python packages - python, setuptools, setuptools-scm, wheel, buildPythonApplication, pytestCheckHook, - pefile, # Optional dependencies withQemu ? false, @@ -46,7 +45,7 @@ let withKernelInstall = true; }; - python3pefile = python.withPackages (_: [ pefile ]); + pythonWithPefile = python.withPackages (ps: [ ps.pefile ]); deps = [ @@ -85,7 +84,7 @@ buildPythonApplication rec { [ (replaceVars ./0001-Use-wrapped-binaries-instead-of-Python-interpreter.patch { UKIFY = "${systemdForMkosi}/lib/systemd/ukify"; - PYTHON_PEFILE = "${python3pefile}/bin/python3.12"; + PYTHON_PEFILE = lib.getExe pythonWithPefile; NIX_PATH = toString (lib.makeBinPath deps); MKOSI_SANDBOX = null; # will be replaced in postPatch })