libosinfo: 0.2.12 → 1.1.0

+41 -10
+30 -10
pkgs/development/libraries/libosinfo/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, libsoup 2 - , libxslt, check, vala_0_23 ? null 1 + { stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk_doc, docbook_xsl 2 + , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { 6 - name = "libosinfo-0.2.12"; 6 + name = "libosinfo-1.1.0"; 7 7 8 8 src = fetchurl { 9 - url = "https://fedorahosted.org/releases/l/i/libosinfo/${name}.tar.gz"; 10 - sha256 = "1vcg8ylh7q69s9y6hj94dqfffwfbann3i28yqgfc01navf6yl07s"; 9 + url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; 10 + sha256 = "0diigllgni6m0sc2h8aid6hmyaq9qb54pm5305m0irfsm2j463v0"; 11 11 }; 12 12 13 - nativeBuildInputs = [ pkgconfig ]; 14 - buildInputs = [ 15 - intltool gobjectIntrospection libsoup libxslt check vala_0_23 13 + outputs = [ "out" "dev" "devdoc" ]; 14 + 15 + nativeBuildInputs = [ 16 + pkgconfig vala intltool gobjectIntrospection gtk_doc docbook_xsl 17 + ] ++ stdenv.lib.optionals doCheck checkInputs; 18 + checkInputs = [ check curl perl ]; 19 + buildInputs = [ glib libsoup libxml2 libxslt ]; 20 + 21 + patches = [ 22 + ./osinfo-db-data-dir.patch 16 23 ]; 17 24 25 + postPatch = '' 26 + patchShebangs . 27 + substituteInPlace osinfo/osinfo_loader.c --subst-var-by OSINFO_DB_DATA_DIR "${osinfo-db}/share" 28 + ''; 29 + 30 + configureFlags = [ 31 + "--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids" 32 + "--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids" 33 + "--enable-gtk-doc" 34 + ]; 35 + 36 + doCheck = true; 37 + 18 38 meta = with stdenv.lib; { 19 - description = "Info about OSs, hypervisors and (virtual) hardware devices"; 20 - homepage = http://libosinfo.org/; 39 + description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; 40 + homepage = https://libosinfo.org/; 21 41 license = licenses.lgpl2Plus; 22 42 platforms = platforms.linux; 23 43 maintainers = [ maintainers.bjornfor ];
+11
pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch
··· 1 + --- a/osinfo/osinfo_loader.c 2 + +++ b/osinfo/osinfo_loader.c 3 + @@ -2304,7 +2304,7 @@ 4 + } else { 5 + path = g_getenv("OSINFO_SYSTEM_DIR"); 6 + if (!path) 7 + - path = DATA_DIR "/osinfo"; 8 + + path = "@OSINFO_DB_DATA_DIR@/osinfo"; 9 + 10 + file = g_file_new_for_path(path); 11 + }