From 53bf5c322d89912ed157ebbd2617ed9190bf8011 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 6 Mar 2021 23:36:32 +0100 Subject: [PATCH] libqmi: 1.26.10 -> 1.28.2 New dependency on QRTR. Also cleaned up the expression a bit. - https://lists.freedesktop.org/archives/libqmi-devel/2021-February/003552.html - https://lists.freedesktop.org/archives/libqmi-devel/2021-March/003554.html --- pkgs/development/libraries/libqmi/default.nix | 48 ++++++++++++++----- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 42d8cbf28596..783469157d87 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,31 +1,49 @@ -{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, glib +, python3 +, libgudev +, libmbim +, libqrtr-glib +}: stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.26.10"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-fABD8GyHXlzx3jwMlMzH9bBYYry82eT7DV0UJ30dq1k="; - }; + version = "1.28.2"; outputs = [ "out" "dev" "devdoc" ]; - configureFlags = [ - "--with-udev-base-dir=${placeholder "out"}/lib/udev" - "--enable-introspection" - ]; + src = fetchurl { + url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; + sha256 = "jIw+5xmHTSUpvOmzWwKP5DWzbwA5eaNg060JOESdt4M="; + }; nativeBuildInputs = [ pkg-config gobject-introspection python3 + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ glib libgudev libmbim + libqrtr-glib + ]; + + configureFlags = [ + "--with-udev-base-dir=${placeholder "out"}/lib/udev" + "--enable-gtk-doc" + "--enable-introspection" ]; enableParallelBuilding = true; @@ -35,7 +53,13 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libqmi/"; description = "Modem protocol helper library"; + maintainers = teams.freedesktop.members; platforms = platforms.linux; - license = licenses.gpl2; + license = with licenses; [ + # Library + lgpl2Plus + # Tools + gpl2Plus + ]; }; }