waagent: patch openssl path
This commit is contained in:
@@ -192,15 +192,6 @@ let
|
|||||||
If set to `null`, the system defaults are used.
|
If set to `null`, the system defaults are used.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
OpensslPath = lib.mkOption {
|
|
||||||
type = types.nullOr types.path;
|
|
||||||
default = lib.getExe pkgs.openssl;
|
|
||||||
defaultText = literalExpression "lib.getExe pkgs.openssl";
|
|
||||||
description = ''
|
|
||||||
Specify a path for the openssl binary to use for cryptographic operations.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
HttpProxy = {
|
HttpProxy = {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
lib,
|
lib,
|
||||||
python3,
|
python3,
|
||||||
bash,
|
bash,
|
||||||
|
openssl,
|
||||||
nixosTests,
|
nixosTests,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@@ -30,11 +31,13 @@ python.pkgs.buildPythonApplication rec {
|
|||||||
# Replace tools used in udev rules with their full path and ensure they are present.
|
# Replace tools used in udev rules with their full path and ensure they are present.
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace config/66-azure-storage.rules \
|
substituteInPlace config/66-azure-storage.rules \
|
||||||
--replace-fail readlink ${coreutils}/bin/readlink \
|
--replace-fail readlink '${coreutils}/bin/readlink' \
|
||||||
--replace-fail cut ${coreutils}/bin/cut \
|
--replace-fail cut '${coreutils}/bin/cut' \
|
||||||
--replace-fail /bin/sh ${bash}/bin/sh
|
--replace-fail '/bin/sh' '${bash}/bin/sh'
|
||||||
substituteInPlace config/99-azure-product-uuid.rules \
|
substituteInPlace config/99-azure-product-uuid.rules \
|
||||||
--replace-fail "/bin/chmod" "${coreutils}/bin/chmod"
|
--replace-fail '/bin/chmod' '${coreutils}/bin/chmod'
|
||||||
|
substituteInPlace azurelinuxagent/common/conf.py \
|
||||||
|
--replace-fail '/usr/bin/openssl' '${openssl}/bin/openssl'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [ python.pkgs.distro ];
|
propagatedBuildInputs = [ python.pkgs.distro ];
|
||||||
|
|||||||
Reference in New Issue
Block a user