From 6de508be51e1030d8755cb1b03fe9d474b2eb7e4 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 15 May 2021 19:13:37 +0200 Subject: [PATCH] lxd: refactor removes libco dependencie from lxd, it's neither used nor maintained anymore by canonical --- pkgs/tools/admin/lxd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index f0deb99c44fb..7397825f714a 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,7 +1,7 @@ { lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap -, libco-canonical, dqlite, raft-canonical, sqlite-replication, udev +, dqlite, raft-canonical, sqlite-replication, udev , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu , bash @@ -38,9 +38,9 @@ buildGoPackage rec { rm _dist/src/github.com/lxc/lxd cp -r _dist/src/* ../../.. popd - ''; - buildFlags = [ "-tags libsqlite3" ]; + makeFlagsArray+=("-tags libsqlite3") + ''; postInstall = '' # test binaries, code generation @@ -59,8 +59,8 @@ buildGoPackage rec { ''; nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ]; - buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev - raft-canonical.dev sqlite-replication udev.dev ]; + buildInputs = [ lxc acl libcap dqlite.dev raft-canonical.dev + sqlite-replication udev.dev ]; meta = with lib; { description = "Daemon based on liblxc offering a REST API to manage containers";