diff options
| author | illustris <rharikrishnan95@gmail.com> | 2022-01-28 19:14:02 +0530 |
|---|---|---|
| committer | illustris <rharikrishnan95@gmail.com> | 2022-01-31 09:50:14 +0530 |
| commit | d0c12f5b3f03c03f9c89efa581c633219f66ae9a (patch) | |
| tree | d5ce7f426f9ebc896e194547113ae3835e0c94c4 | |
| parent | 8a5e9ef604ef32048891adb0649c68cf8f3c528e (diff) | |
| download | nixpkgs-d0c12f5b3f03c03f9c89efa581c633219f66ae9a.tar nixpkgs-d0c12f5b3f03c03f9c89efa581c633219f66ae9a.tar.gz nixpkgs-d0c12f5b3f03c03f9c89efa581c633219f66ae9a.tar.bz2 nixpkgs-d0c12f5b3f03c03f9c89efa581c633219f66ae9a.tar.lz nixpkgs-d0c12f5b3f03c03f9c89efa581c633219f66ae9a.tar.xz nixpkgs-d0c12f5b3f03c03f9c89efa581c633219f66ae9a.tar.zst nixpkgs-d0c12f5b3f03c03f9c89efa581c633219f66ae9a.zip | |
cloud-init: fix network renderer detection
| -rw-r--r-- | pkgs/tools/virtualization/cloud-init/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 6bc070d2cbb..470c6610ce4 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,11 +1,14 @@ { lib +, nixosTests , buildPythonApplication , cloud-utils , dmidecode , fetchFromGitHub +, iproute2 , openssh , python3 , shadow +, systemd }: python3.pkgs.buildPythonApplication rec { @@ -25,6 +28,13 @@ python3.pkgs.buildPythonApplication rec { prePatch = '' substituteInPlace setup.py \ --replace /lib/systemd $out/lib/systemd + + substituteInPlace cloudinit/net/networkd.py \ + --replace "['/usr/sbin', '/bin']" "['/usr/sbin', '/bin', '${iproute2}/bin', '${systemd}/bin']" + + substituteInPlace tests/unittests/test_net_activators.py \ + --replace "['/usr/sbin', '/bin']" \ + "['/usr/sbin', '/bin', '${iproute2}/bin', '${systemd}/bin']" ''; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d61e9a13bb8..5f525c435b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2521,7 +2521,7 @@ with pkgs; clog-cli = callPackage ../development/tools/clog-cli { }; - cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { }; + cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { inherit systemd; }; cloudbrute = callPackage ../tools/security/cloudbrute { }; |