Merge master into staging-next

2021-05-18 18:36:35 +00:00
parent ca46ad3762 73b982e621
commit 503669d23a
1 changed files with 4 additions and 0 deletions
--- a/pkgs/applications/virtualization/spice-vdagent/default.nix
+++ b/pkgs/applications/virtualization/spice-vdagent/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
    url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2";
    sha256 = "0n8jlc1pv6mkry161y656b1nk9hhhminjq6nymzmmyjl7k95ymzx";
  };
+
+  # FIXME: May no longer be needed with spice-vdagent versions over 0.21.0
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
  postPatch = ''
    substituteInPlace data/spice-vdagent.desktop --replace /usr $out
  '';