about summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
author7c6f434c <7c6f434c@mail.ru>2022-03-31 08:48:47 +0000
committerGitHub <noreply@github.com>2022-03-31 08:48:47 +0000
commit45f983892846464f3582663d14c8fa605921e6a1 (patch)
tree21126253e4a8fd3da31b52de441d642c69e4f087 /pkgs/applications/virtualization
parent5698f541d3e2be1cc5740603d6d3071fef239214 (diff)
parent32d1e6082c970058ad9035fa5d2bfc339b6254f7 (diff)
downloadnixlib-45f983892846464f3582663d14c8fa605921e6a1.tar
nixlib-45f983892846464f3582663d14c8fa605921e6a1.tar.gz
nixlib-45f983892846464f3582663d14c8fa605921e6a1.tar.bz2
nixlib-45f983892846464f3582663d14c8fa605921e6a1.tar.lz
nixlib-45f983892846464f3582663d14c8fa605921e6a1.tar.xz
nixlib-45f983892846464f3582663d14c8fa605921e6a1.tar.zst
nixlib-45f983892846464f3582663d14c8fa605921e6a1.zip
Merge pull request #166407 from bobby285271/virt-viewer
virt-viewer: fix build with meson 0.61
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/virt-viewer/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index 86474da9ee61..95909e36d0c0 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , bash-completion
 , fetchurl
+, fetchpatch
 , gdbm ? null
 , glib
 , gsettings-desktop-schemas
@@ -43,6 +44,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-pD+iMlxMHHelyMmAZaww7wURohrJjlkPIjQIabrZq9A=";
   };
 
+  patches = [
+    # Fix build with meson 0.61
+    # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117
+    (fetchpatch {
+      url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/ed19e51407bee53988878a6ebed4e7279d00b1a1.patch";
+      sha256 = "sha256-3AbnkbhWOh0aNjUkmVoSV/9jFQtvTllOr7plnkntb2o=";
+    })
+  ];
+
   nativeBuildInputs = [
     glib
     intltool