From 729a3efc568d7beb3a3aae3fb4055cd2d8dbc4d1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 30 Oct 2024 20:37:17 +0100 Subject: [PATCH] chipsec: pass --build-libs without relying on bash eval of setupPyBuildFlags We'd like to remove bash eval for setupByBuildFlags, thus use appendToVar in the hook instead. Tested that linuxPackages.chipsec still builds, including the driver in the right place. --- pkgs/tools/security/chipsec/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 73c1ade5bd63..f38764b79163 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -44,6 +44,7 @@ python3.pkgs.buildPythonApplication rec { preBuild = lib.optionalString withDriver '' export CHIPSEC_BUILD_LIB=$(mktemp -d) mkdir -p $CHIPSEC_BUILD_LIB/chipsec/helper/linux + appendToVar setupPyBuildFlags "--build-lib=$CHIPSEC_BUILD_LIB" ''; env.NIX_CFLAGS_COMPILE = toString [ @@ -57,9 +58,7 @@ python3.pkgs.buildPythonApplication rec { $out/${python3.pkgs.python.sitePackages}/drivers/linux/chipsec.ko ''; - setupPyBuildFlags = [ - "--build-lib=$CHIPSEC_BUILD_LIB" - ] ++ lib.optionals (!withDriver) [ + setupPyBuildFlags = lib.optionals (!withDriver) [ "--skip-driver" ];