cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #144199 from andersk/lxd-core-scheduling

Browse source 
lxd: Add upstream patch for LXC 4.0.11 compatibility
This commit is contained in:
Mario Rodas 2021-11-02 06:21:27 -05:00 committed by GitHub
commit 3a3655912d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/admin/lxd/default.nix
View file

@ -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"