Merge pull request #161101 from jtojnar/libgovirt-cleanup

libgovirt: clean up
This commit is contained in:
Jan Tojnar 2022-02-21 15:57:10 +01:00 committed by GitHub
commit 8eb1922f64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 12 deletions

View File

@ -2,38 +2,52 @@
, stdenv
, fetchurl
, glib
, gnome
, librest
, libsoup
, pkg-config
, gobject-introspection
}:
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=";
};
outputs = [ "out" "dev" ];
enableParallelBuilding = true;
src = fetchurl {
url = "mirror://gnome/sources/libgovirt/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg=";
};
nativeBuildInputs = [
pkg-config
gobject-introspection
];
propagatedBuildInputs = [
librest
buildInputs = [
libsoup
];
meta = {
propagatedBuildInputs = [
glib
librest
];
enableParallelBuilding = true;
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};
};
meta = with lib; {
homepage = "https://gitlab.gnome.org/GNOME/libgovirt";
description = "GObject wrapper for the oVirt REST API";
maintainers = [ maintainers.amarshall ];
platforms = platforms.linux;
license = licenses.lgpl21;
license = licenses.lgpl21Plus;
};
}

View File

@ -4,7 +4,11 @@
, pkg-config
, glib
, libsoup
, libxml2
, gobject-introspection
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_412
, gnome
}:
@ -12,6 +16,8 @@ stdenv.mkDerivation rec {
pname = "rest";
version = "0.8.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
@ -20,14 +26,19 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
gobject-introspection
gtk-doc
docbook-xsl-nons
docbook_xml_dtd_412
];
buildInputs = [
propagatedBuildInputs = [
glib
libsoup
libxml2
];
configureFlags = [
"--enable-gtk-doc"
# Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged.
"--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
];