diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-11-02 06:21:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-02 06:21:27 -0500 |
| commit | 3a3655912d5e7780e620ba4497880dbb22e3c5da (patch) | |
| tree | 9913413c213555689f5f4fce6a66f7700fcd5afa /pkgs/tools/admin/lxd | |
| parent | 2fe98c17d664d51eda1e58396265840775126947 (diff) | |
| parent | 513e2ef5d4e59455243f3a468aff1915c9a840b6 (diff) | |
Merge pull request #144199 from andersk/lxd-core-scheduling
lxd: Add upstream patch for LXC 4.0.11 compatibility
Diffstat (limited to 'pkgs/tools/admin/lxd')
| -rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index ec6b867f9f7c1..fc07d33f647df 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl +{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl, fetchpatch , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, attr , squashfsTools, iproute2, iptables, libcap , dqlite, raft-canonical, sqlite-replication, udev @@ -20,6 +20,14 @@ buildGoPackage rec { sha256 = "0mxbzg8xra0qpd3g3z1b230f0519h56x4jnn09lbbqa92p5zck3f"; }; + patches = [ + # lxd/checkfeature: check whether the kernel supports core scheduling + (fetchpatch { + url = "https://github.com/lxc/lxd/commit/ba6be1043714458b29c4b37687d4f624ee421943.patch"; + sha256 = "0716129n70c6i695fyi1j8q6cls7g62vkdpcrlfrr9i324y3w1dx"; + }) + ]; + postPatch = '' substituteInPlace shared/usbid/load.go \ --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" |