Commit acdb865b authored by Arian van Putten's avatar Arian van Putten
Browse files

openscap: Don't hardcode PATH for SCE

Was introduced in https://github.com/OpenSCAP/openscap/commit/f4c30de885958a656625eca4ed460ee67d95d586

Not sure why. Let me remove the line so it picks up the transient
environment.

This makes SCE scripts work.
parent 7f556b60
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -106,6 +106,10 @@ stdenv.mkDerivation rec {
      --replace-fail "DESTINATION ''${PERL_VENDORARCH}" "DESTINATION ''${SWIG_PERL_DIR}"
    substituteInPlace src/common/oscap_pcre.c \
      --replace-fail "#include <pcre2.h>" "#include <${pcre2.dev}/include/pcre2.h>"

    # Patch SCE engine to not hardcode FHS paths, allowing it to use the transient environment's PATH
    substituteInPlace src/SCE/sce_engine.c \
      --replace-fail 'env_values[0] = "PATH=/bin:/sbin:/usr/bin:/usr/local/bin:/usr/sbin";' 'env_values[0] = "_PATCHED_OUT_DUMMY_VAR=patched-out";'
  '';

  cmakeFlags = [