diff options
| author | Atemu <atemu.main@gmail.com> | 2023-02-03 16:35:09 +0100 |
|---|---|---|
| committer | Atemu <atemu.main@gmail.com> | 2023-02-04 15:13:35 +0100 |
| commit | 910f943116daa99143ffec26785e2fa41fd68249 (patch) | |
| tree | e9fae8e6cfc6bd87779ce82f7aafe097fd4cab0f | |
| parent | d397b090626b21a2f84aa594d6e550479bf1b09d (diff) | |
| download | nixpkgs-910f943116daa99143ffec26785e2fa41fd68249.tar nixpkgs-910f943116daa99143ffec26785e2fa41fd68249.tar.gz nixpkgs-910f943116daa99143ffec26785e2fa41fd68249.tar.bz2 nixpkgs-910f943116daa99143ffec26785e2fa41fd68249.tar.lz nixpkgs-910f943116daa99143ffec26785e2fa41fd68249.tar.xz nixpkgs-910f943116daa99143ffec26785e2fa41fd68249.tar.zst nixpkgs-910f943116daa99143ffec26785e2fa41fd68249.zip | |
virt-viewer: cleanup
| -rw-r--r-- | pkgs/applications/virtualization/virt-viewer/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 58948c8f80b..5a4a8600877 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -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="; }) ]; |