summary refs log tree commit diff
path: root/pkgs/applications/virtualization/spice-vdagent/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-08-27 14:34:43 +0000
committerAlyssa Ross <hi@alyssa.is>2020-08-27 14:34:43 +0000
commit23fa25640d5c67092f50d9f1663f832f8ea70bfe (patch)
tree67404489680e3006c3f0e5ea8921dd07437c3402 /pkgs/applications/virtualization/spice-vdagent/default.nix
parentc901f337b8fed63ba0bb53674950ce4c7bf94dcd (diff)
parentea464f4b636ce1667e6e79b9f38707b730d93da3 (diff)
downloadnixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar
nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar.gz
nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar.bz2
nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar.lz
nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar.xz
nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.tar.zst
nixpkgs-23fa25640d5c67092f50d9f1663f832f8ea70bfe.zip
Merge branch 'upstream-merge' into master
Diffstat (limited to 'pkgs/applications/virtualization/spice-vdagent/default.nix')
-rw-r--r--pkgs/applications/virtualization/spice-vdagent/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix
index 22aa31a6dea..f577ded70ba 100644
--- a/pkgs/applications/virtualization/spice-vdagent/default.nix
+++ b/pkgs/applications/virtualization/spice-vdagent/default.nix
@@ -8,6 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf";
   };
   NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];
+  patchFlags = [ "-uNp1" ];
+  # included in the next release.
+  patches = [ ./timeout.diff ];
   postPatch = ''
     substituteInPlace data/spice-vdagent.desktop --replace /usr $out
   '';