public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modemmanager: 1.7.990 -> 1.10.0

Browse Source 
* Add flags for systemd [0]

* Enable tests
  Though I actually didn't look to see how they're
  performed, only effort done was to get a success-
  ful build.

* Enable vala bindings

[0]: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/blob/1.8.0/NEWS#L21
This commit is contained in:
worldofpeace 2019-03-15 13:15:24 -04:00
parent fd5c74c25c
commit cb962e829c
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/tools/networking/modem-manager/default.nix
View File

@ -1,52 +1,40 @@
{ stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig { stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig
, libmbim, libqmi, systemd, fetchpatch }: , libmbim, libqmi, systemd, vala, gobject-introspection, dbus }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "modem-manager-${version}"; pname = "modem-manager";
version = "1.7.990"; version = "1.10.0";
package = "ModemManager"; package = "ModemManager";
src = fetchurl { src = fetchurl {
url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz";
sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl"; sha256 = "1qkfnxqvaraz1npahqvm5xc73mbxxic8msnsjmlwkni5c2ckj3zx";
}; };
nativeBuildInputs = [ gettext pkgconfig ]; nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ];
buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ];
patches = [
# Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt)
(fetchpatch {
url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609";
sha256 = "0av0sqdvbhwjnhqqylkc7rmqcj6awqmz5693l9x93nlwp7zya95j";
})
];
configureFlags = [ configureFlags = [
"--with-polkit" "--with-polkit"
"--with-udev-base-dir=$(out)/lib/udev" "--with-udev-base-dir=${placeholder ''out''}/lib/udev"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-dbus-sys-dir=${placeholder ''out''}/etc/dbus-1/system.d"
"--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--with-suspend-resume=systemd" "--with-systemd-suspend-resume"
"--with-systemd-journal"
]; ];
installFlags = [ "DESTDIR=\${out}" ]; preCheck = ''
export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
preInstall = ''
mkdir -p $out/etc/systemd/system
''; '';
doCheck = true;
postInstall = '' postInstall = ''
# rename to modem-manager to be in style # rename to modem-manager to be in style
mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service mv $out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service
rm -rf $out/$out/etc
mv $out/$out/* $out
DIR=$out/$out
while rmdir $DIR 2>/dev/null; do
DIR="$(dirname "$DIR")"
done
# systemd in NixOS doesn't use `systemctl enable`, so we need to establish # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
# aliases ourselves. # aliases ourselves.