Merge pull request #160074 from amarshall/virt-viewer-11
virt-viewer: 9.0 -> 11; libgovirt: init at 0.3.8
This commit is contained in:
commit
4870e97e9d
|
@ -601,6 +601,12 @@
|
||||||
githubId = 15623522;
|
githubId = 15623522;
|
||||||
name = "Amar Paul";
|
name = "Amar Paul";
|
||||||
};
|
};
|
||||||
|
amarshall = {
|
||||||
|
email = "andrew@johnandrewmarshall.com";
|
||||||
|
github = "amarshall";
|
||||||
|
githubId = 153175;
|
||||||
|
name = "Andrew Marshall";
|
||||||
|
};
|
||||||
ambroisie = {
|
ambroisie = {
|
||||||
email = "bruno.nixpkgs@belanyi.fr";
|
email = "bruno.nixpkgs@belanyi.fr";
|
||||||
github = "ambroisie";
|
github = "ambroisie";
|
||||||
|
|
39
pkgs/applications/virtualization/libgovirt/default.nix
Normal file
39
pkgs/applications/virtualization/libgovirt/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, glib
|
||||||
|
, librest
|
||||||
|
, libsoup
|
||||||
|
, pkg-config
|
||||||
|
}:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "libgovirt";
|
||||||
|
version = "0.3.8";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://download.gnome.org/sources/libgovirt/0.3/${pname}-${version}.tar.xz";
|
||||||
|
sha256 = "sha256-HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
librest
|
||||||
|
libsoup
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "https://gitlab.gnome.org/GNOME/libgovirt";
|
||||||
|
description = "GObject wrapper for the oVirt REST API";
|
||||||
|
maintainers = [ maintainers.amarshall ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
license = licenses.lgpl21;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,36 +1,86 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, intltool, shared-mime-info, wrapGAppsHook
|
{ lib
|
||||||
, glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte
|
, stdenv
|
||||||
|
, bash-completion
|
||||||
|
, fetchurl
|
||||||
|
, gdbm ? null
|
||||||
|
, glib
|
||||||
|
, gsettings-desktop-schemas
|
||||||
|
, gtk-vnc
|
||||||
|
, gtk3
|
||||||
|
, intltool
|
||||||
|
, libcap ? null
|
||||||
|
, libgovirt
|
||||||
|
, libvirt
|
||||||
|
, libvirt-glib
|
||||||
|
, libxml2
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, pkg-config
|
||||||
|
, python3
|
||||||
|
, shared-mime-info
|
||||||
|
, spice-gtk ? null
|
||||||
|
, spice-protocol ? null
|
||||||
, spiceSupport ? true
|
, spiceSupport ? true
|
||||||
, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
|
, vte
|
||||||
|
, wrapGAppsHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert spiceSupport ->
|
assert spiceSupport -> (
|
||||||
spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null;
|
gdbm != null
|
||||||
|
&& libcap != null
|
||||||
|
&& spice-gtk != null
|
||||||
|
&& spice-protocol != null
|
||||||
|
);
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
baseName = "virt-viewer";
|
baseName = "virt-viewer";
|
||||||
version = "9.0";
|
version = "11.0";
|
||||||
name = "${baseName}-${version}";
|
name = "${baseName}-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
|
url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.xz";
|
||||||
sha256 = "09a83mzyn3b4nd7wpa659g1zf1fjbzb79rk968bz6k5xl21k7d4i";
|
sha256 = "sha256-pD+iMlxMHHelyMmAZaww7wURohrJjlkPIjQIabrZq9A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config intltool shared-mime-info wrapGAppsHook glib ];
|
nativeBuildInputs = [
|
||||||
|
glib
|
||||||
|
intltool
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
pkg-config
|
||||||
|
python3
|
||||||
|
shared-mime-info
|
||||||
|
wrapGAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte
|
bash-completion
|
||||||
|
glib
|
||||||
|
gsettings-desktop-schemas
|
||||||
|
gtk-vnc
|
||||||
|
gtk3
|
||||||
|
libgovirt
|
||||||
|
libvirt
|
||||||
|
libvirt-glib
|
||||||
|
libxml2
|
||||||
|
vte
|
||||||
] ++ optionals spiceSupport [
|
] ++ optionals spiceSupport [
|
||||||
spice-gtk spice-protocol libcap gdbm
|
gdbm
|
||||||
|
libcap
|
||||||
|
spice-gtk
|
||||||
|
spice-protocol
|
||||||
];
|
];
|
||||||
|
|
||||||
# Required for USB redirection PolicyKit rules file
|
# Required for USB redirection PolicyKit rules file
|
||||||
propagatedUserEnvPkgs = optional spiceSupport spice-gtk;
|
propagatedUserEnvPkgs = optional spiceSupport spice-gtk;
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
postPatch = ''
|
||||||
|
patchShebangs build-aux/post_install.py
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A viewer for remote virtual machines";
|
description = "A viewer for remote virtual machines";
|
||||||
|
|
|
@ -7079,6 +7079,8 @@ with pkgs;
|
||||||
|
|
||||||
libcsptr = callPackage ../development/libraries/libcsptr { };
|
libcsptr = callPackage ../development/libraries/libcsptr { };
|
||||||
|
|
||||||
|
libgovirt = callPackage ../applications/virtualization/libgovirt { };
|
||||||
|
|
||||||
libscrypt = callPackage ../development/libraries/libscrypt { };
|
libscrypt = callPackage ../development/libraries/libscrypt { };
|
||||||
|
|
||||||
libcloudproviders = callPackage ../development/libraries/libcloudproviders { };
|
libcloudproviders = callPackage ../development/libraries/libcloudproviders { };
|
||||||
|
|
Loading…
Reference in a new issue