diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-05 19:51:09 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-05 19:51:09 +0200 |
| commit | 9875bbae75231f395ab020fbef6cbae698cc75c5 (patch) | |
| tree | eabae7448bcbba0d55420a068f5f55728e1736dc /pkgs/tools/admin/lxd | |
| parent | 320f79365d41aef687a07b50c725926932c9372b (diff) | |
| parent | 73dc3fc400141176138c95ea9c3f28750b2608e6 (diff) | |
| download | nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.gz nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.bz2 nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.lz nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.xz nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.zst nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/admin/lxd')
| -rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index e4ac149a8edb..a3c94d74897d 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl +{ stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite , raft-canonical, sqlite-replication, udev @@ -19,6 +19,11 @@ buildGoPackage rec { sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx"; }; + postPatch = '' + substituteInPlace shared/usbid/load.go \ + --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" + ''; + preBuild = '' # unpack vendor pushd go/src/github.com/lxc/lxd |