diff options
Diffstat (limited to 'pkgs/tools/admin/lxd/default.nix')
-rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 6051c16e91e1..f270576e684a 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 @@ -10,15 +10,20 @@ buildGoPackage rec { pname = "lxd"; - version = "4.0.1"; + version = "4.1"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx"; + sha256 = "0svzj57wwm43d2gnx0myr2p9pzjmkivwhgg0dww6zl169bx32liz"; }; + 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 @@ -31,9 +36,9 @@ buildGoPackage rec { postInstall = '' # test binaries, code generation - rm $bin/bin/{deps,macaroon-identity,generate} + rm $out/bin/{deps,macaroon-identity,generate} - wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ + wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" |