public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86660 from asbachb/lxd-usb.ids 

lxd: added patch for fixing path `/usr/share/misc/usb.ids`
This commit is contained in:
Mario Rodas 2020-05-03 18:33:28 -05:00 committed by GitHub
parent a0b3d546e6 32934a673f
commit d33c22d954
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/admin/lxd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl { stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
, squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite , squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite
, raft-canonical, sqlite-replication, udev , raft-canonical, sqlite-replication, udev
@ -19,6 +19,11 @@ buildGoPackage rec {
sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx"; sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx";
}; };
postPatch = ''
substituteInPlace shared/usbid/load.go \
--replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids"
'';
preBuild = '' preBuild = ''
# unpack vendor # unpack vendor
pushd go/src/github.com/lxc/lxd pushd go/src/github.com/lxc/lxd