diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/libraries/libqmi/default.nix | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libqmi/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libqmi/default.nix | 51 |
1 files changed, 39 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix index 7bd3fa97029a..8a3179b03427 100644 --- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -1,33 +1,54 @@ -{ 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.8"; + version = "1.28.2"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-73bclasKBjIaG9Jeh1SJy6Esn2YRl0ygE1zwZ7sgyWA="; + sha256 = "jIw+5xmHTSUpvOmzWwKP5DWzbwA5eaNg060JOESdt4M="; }; - outputs = [ "out" "dev" "devdoc" ]; - - configureFlags = [ - "--with-udev-base-dir=${placeholder "out"}/lib/udev" - "--enable-introspection" - ]; - nativeBuildInputs = [ pkg-config gobject-introspection python3 + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ - glib libgudev libmbim ]; + propagatedBuildInputs = [ + glib + libqrtr-glib + ]; + + configureFlags = [ + "--with-udev-base-dir=${placeholder "out"}/lib/udev" + "--enable-gtk-doc" + "--enable-introspection" + ]; + enableParallelBuilding = true; doCheck = true; @@ -35,7 +56,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 + ]; }; } |