diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2023-02-02 00:28:14 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2023-02-02 01:26:32 +0100 |
commit | 57af6a6e7d3a1a229dfe2e5ee7e5e59547b8e345 (patch) | |
tree | 7dbb1fdc1e57529701a1ef6afe8962d2b82c8dac /pkgs/development/libraries/libqmi | |
parent | a1e8dfcdf477f3458902a03019b12033437ec7e3 (diff) |
libqmi: 1.30.8 → 1.32.2
- Autotools no longer supported. - Tarballs no longer available. https://lists.freedesktop.org/archives/libqmi-devel/2022-October/003803.html https://lists.freedesktop.org/archives/libqmi-devel/2022-October/003808.html https://lists.freedesktop.org/archives/libqmi-devel/2022-October/003811.html https://lists.freedesktop.org/archives/libqmi-devel/2022-November/003812.html
Diffstat (limited to 'pkgs/development/libraries/libqmi')
-rw-r--r-- | pkgs/development/libraries/libqmi/default.nix | 46 |
1 files changed, 35 insertions, 11 deletions
diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index b261967f5cf26..05a44980f83cc 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,40 +1,61 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, fetchpatch2 +, meson +, ninja , pkg-config , gobject-introspection , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, help2man , glib , python3 , libgudev +, bash-completion , libmbim , libqrtr-glib }: stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.30.8"; + version = "1.32.2"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-hiSCzp460L1l0mQzTuMRzblLnfKGO1txNjCbQbisGZA="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mobile-broadband"; + repo = "libqmi"; + rev = version; + hash = "sha256-XIbeWgkPiJL8hN8Rb6KFt5Q5sG3KsiEQr0EnhwmI6h8="; }; + patches = [ + # Fix pkg-config file missing qrtr in Requires. + # https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/99 + (fetchpatch2 { + url = "https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/7d08150910974c6bd2c29f887c2c6d4a3526e085.patch"; + hash = "sha256-LFrlm2ZqLqewLGO2FxL5kFYbZ7HaxdxvVHsFHYSgZ4Y="; + }) + ]; + nativeBuildInputs = [ + meson + ninja pkg-config gobject-introspection python3 gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + help2man ]; buildInputs = [ libgudev + bash-completion libmbim ]; @@ -43,16 +64,19 @@ stdenv.mkDerivation rec { libqrtr-glib ]; - configureFlags = [ - "--with-udev-base-dir=${placeholder "out"}/lib/udev" - "--enable-gtk-doc=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "yes" else "no"}" - "--enable-introspection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "yes" else "no"}" + mesonFlags = [ + "-Dudevdir=${placeholder "out"}/lib/udev" + (lib.mesonBool "gtk_doc" (stdenv.buildPlatform == stdenv.hostPlatform)) + (lib.mesonBool "introspection" (stdenv.buildPlatform == stdenv.hostPlatform)) ]; - enableParallelBuilding = true; - doCheck = true; + postPatch = '' + patchShebangs \ + build-aux/qmi-codegen/qmi-codegen + ''; + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libqmi/"; description = "Modem protocol helper library"; |