nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

virt-viewer: cleanup

Browse Source
This commit is contained in:
Atemu 2023-02-03 16:35:09 +01:00
parent d397b09062
commit 910f943116
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/virtualization/virt-viewer/default.nix
View File

@ -3,13 +3,13 @@
, bash-completion
, fetchurl
, fetchpatch
, gdbm ? null
, gdbm
, glib
, gsettings-desktop-schemas
, gtk-vnc
, gtk3
, intltool
, libcap ? null
, libcap
, libgovirt
# Currently unsupported. According to upstream, libgovirt is for a very narrow
# use-case and we don't currently cover it in Nixpkgs. It's safe to disable.
@ -26,20 +26,13 @@
, python3
, shared-mime-info
# https://gitlab.com/virt-viewer/virt-viewer/-/issues/88
, spice-gtk_libsoup2 ? null
, spice-protocol ? null
, spice-gtk_libsoup2
, spice-protocol
, spiceSupport ? true
, vte
, wrapGAppsHook
}:
assert spiceSupport -> (
gdbm != null
&& (stdenv.isLinux -> libcap != null)
&& spice-gtk_libsoup2 != null
&& spice-protocol != null
);
with lib;
stdenv.mkDerivation rec {
@ -52,10 +45,10 @@ stdenv.mkDerivation rec {
};
patches = [
# Fix build with meson 0.61
# https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117
# Fix build with meson 0.61. Should be fixed in the next release.
# https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/120
(fetchpatch {
url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/ed19e51407bee53988878a6ebed4e7279d00b1a1.patch";
url = "https://gitlab.com/virt-viewer/virt-viewer/-/commit/98d9f202ef768f22ae21b5c43a080a1aa64a7107.patch";
sha256 = "sha256-3AbnkbhWOh0aNjUkmVoSV/9jFQtvTllOr7plnkntb2o=";
})
];