From a1e8dfcdf477f3458902a03019b12033437ec7e3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 2 Feb 2023 00:49:48 +0100 Subject: [PATCH] =?UTF-8?q?libmbim:=201.26.4=20=E2=86=92=201.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Autotools no longer supported. - Tarballs no longer available. https://lists.freedesktop.org/archives/libmbim-devel/2022-October/001193.html https://lists.freedesktop.org/archives/libmbim-devel/2022-October/001195.html https://lists.freedesktop.org/archives/libmbim-devel/2022-October/001196.html https://lists.freedesktop.org/archives/libmbim-devel/2022-October/001197.html https://lists.freedesktop.org/archives/libmbim-devel/2022-November/001198.html --- .../development/libraries/libmbim/default.nix | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index eb32fca71641..f9f15b683946 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,46 +1,63 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, meson +, ninja , pkg-config , glib , python3 +, help2man , systemd +, bash-completion , withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform , gobject-introspection }: stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.26.4"; + version = "1.28.2"; outputs = [ "out" "dev" "man" ]; - src = fetchurl { - url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "sha256-9ojOxMRYahdXX14ydEjOYvIADvagfJ5FiYc9SmhWitk="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mobile-broadband"; + repo = "libmbim"; + rev = version; + hash = "sha256-EtjUaSNBT1e/eeTX4oHzQolGrisbsGKBK8Cfl3rRQTQ="; }; - configureFlags = [ - "--with-udev-base-dir=${placeholder "out"}/lib/udev" - (lib.enableFeature withIntrospection "introspection") + mesonFlags = [ + "-Dudevdir=${placeholder "out"}/lib/udev" + (lib.mesonBool "introspection" withIntrospection) ]; nativeBuildInputs = [ + meson + ninja pkg-config python3 + help2man gobject-introspection ]; buildInputs = [ glib systemd + bash-completion ]; doCheck = true; + postPatch = '' + patchShebangs \ + build-aux/mbim-codegen/mbim-codegen + ''; + meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/libmbim/"; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; + maintainers = teams.freedesktop.members; platforms = platforms.linux; license = licenses.gpl2Plus; };