From e9e726b4597104af63531bdee8fa7cc062d6821c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 23 Jul 2022 20:42:25 +0200 Subject: [PATCH] =?UTF-8?q?libqrtr-glib:=201.0.0=20=E2=86=92=201.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://lists.freedesktop.org/archives/libqmi-devel/2021-November/003721.html https://lists.freedesktop.org/archives/libqmi-devel/2022-February/003762.html --- .../libraries/libqrtr-glib/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libqrtr-glib/default.nix b/pkgs/development/libraries/libqrtr-glib/default.nix index aefc61f1ccf7..e7445468ecc3 100644 --- a/pkgs/development/libraries/libqrtr-glib/default.nix +++ b/pkgs/development/libraries/libqrtr-glib/default.nix @@ -1,6 +1,8 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, meson +, ninja , pkg-config , gobject-introspection , gtk-doc @@ -11,13 +13,16 @@ stdenv.mkDerivation rec { pname = "libqrtr-glib"; - version = "1.0.0"; + version = "1.2.2"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "MNh5sq3m+PRh3vOmd3VdtcAji6v2iNXIPAOz5qvjXO4="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mobile-broadband"; + repo = "libqrtr-glib"; + rev = version; + sha256 = "kHLrOXN6wgBrHqipo2KfAM5YejS0/bp7ziBSpt0s1i0="; }; strictDeps = true; @@ -27,6 +32,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + meson + ninja pkg-config gobject-introspection gtk-doc @@ -38,8 +45,8 @@ stdenv.mkDerivation rec { glib ]; - configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ - "--enable-gtk-doc" + mesonFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dgtk_doc=false" ]; meta = with lib; {