From 2f583129e2d92b480dbf6d95e55652db3d496e80 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Thu, 11 Jul 2019 16:06:08 +0300 Subject: [PATCH 1/6] spice-gtk: propagate gstreamer plugins Note: there is no sound without gst-plugins-good. --- pkgs/development/libraries/spice-gtk/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 079d61ca3d5..8f92e0b64f6 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -87,10 +87,13 @@ stdenv.mkDerivation rec { vala ]; + propagatedBuildInputs = [ + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; + buildInputs = [ cyrus_sasl epoxy - gst_all_1.gst-plugins-base gtk3 json-glib libcacard From 22e2acd736a57ca4af1934918de00232b3e33d9f Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Fri, 12 Jul 2019 23:19:07 +0300 Subject: [PATCH 2/6] virtmanager: add missing GI dependencies --- pkgs/applications/virtualization/virt-manager/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 392517e3ab2..9011932a30b 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -2,6 +2,7 @@ , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 +, gtksourceview4 , spiceSupport ? true, spice-gtk ? null , cpio, e2fsprogs, findutils, gzip }: @@ -25,7 +26,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi - gsettings-desktop-schemas libosinfo gtk3 + gsettings-desktop-schemas libosinfo gtksourceview4 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; From cdfc0b6429ed53bd4ff228a9fd8bfdff05905b96 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Fri, 12 Jul 2019 23:19:28 +0300 Subject: [PATCH 3/6] virtmanager: fix librsvg propagation from wrapGAppsHook Custom buildPhase should be removed once there is support for setupPyDistFlags (not a final name). --- .../virtualization/virt-manager/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9011932a30b..249f5948dbb 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -9,6 +9,10 @@ with stdenv.lib; +# TODO: remove after there's support for setupPyDistFlags +let + setuppy = ../../../development/interpreters/python/run_setup.py; +in python3Packages.buildPythonApplication rec { name = "virt-manager-${version}"; version = "2.2.0"; @@ -20,11 +24,12 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook intltool file + intltool file gobject-introspection # for setup hook populating GI_TYPELIB_PATH ]; buildInputs = [ + wrapGAppsHook libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 @@ -44,6 +49,14 @@ python3Packages.buildPythonApplication rec { ${python3Packages.python.interpreter} setup.py configure --prefix=$out ''; + # TODO: remove after there's support for setupPyDistFlags + buildPhase = '' + runHook preBuild + cp ${setuppy} nix_run_setup + ${python3Packages.python.pythonForBuild.interpreter} nix_run_setup --no-update-icon-cache build_ext bdist_wheel + runHook postBuild + ''; + postInstall = '' ${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas ''; From 5e18c7cf210803f42e526a89d834f13904f7cf9d Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Fri, 12 Jul 2019 23:21:52 +0300 Subject: [PATCH 4/6] virtmanager: remove redundant gsettings schema compilation Schemas are now compiled in the setup.py. --- pkgs/applications/virtualization/virt-manager/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 249f5948dbb..86cedcfbe06 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -57,10 +57,6 @@ python3Packages.buildPythonApplication rec { runHook postBuild ''; - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas - ''; - preFixup = '' gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") # these are called from virt-install in initrdinject.py From 6b68d9b911087fcf3445ba1e43a6c521722c2b12 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Fri, 12 Jul 2019 23:49:40 +0300 Subject: [PATCH 5/6] virtviewer: remove gstreamer plugins already propagated by spice-gtk --- pkgs/applications/virtualization/virt-viewer/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 7c90f9b3483..9c307d8e9ba 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { xen ] ++ optionals spiceSupport [ spice-gtk spice-protocol libcap gdbm - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; # Required for USB redirection PolicyKit rules file From 2df33c40ffa446cc0dd00c45dc7c71f8f6cf41c8 Mon Sep 17 00:00:00 2001 From: Kirill Boltaev Date: Fri, 12 Jul 2019 23:55:37 +0300 Subject: [PATCH 6/6] virtmanager: remove redundant gtk3 dependency --- pkgs/applications/virtualization/virt-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 86cedcfbe06..2a76cf487b0 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 +, gsettings-desktop-schemas, glib, libosinfo, gnome3 , gtksourceview4 , spiceSupport ? true, spice-gtk ? null , cpio, e2fsprogs, findutils, gzip