diff options
| author | adisbladis <adis@blad.is> | 2018-03-23 17:04:24 +0800 |
|---|---|---|
| committer | adisbladis <adis@blad.is> | 2018-03-23 17:04:36 +0800 |
| commit | 2e73e2ae79ea17c39d095c7a529f4a1047802ca0 (patch) | |
| tree | ecd544ea2a234a28b8b9b1102e7d52ed20684a8e /pkgs/tools/networking/modemmanager/default.nix | |
| parent | 1aedde9e343391f4a58f94cc40ff8584d7ba025c (diff) | |
| download | nixpkgs-2e73e2ae79ea17c39d095c7a529f4a1047802ca0.tar nixpkgs-2e73e2ae79ea17c39d095c7a529f4a1047802ca0.tar.gz nixpkgs-2e73e2ae79ea17c39d095c7a529f4a1047802ca0.tar.bz2 nixpkgs-2e73e2ae79ea17c39d095c7a529f4a1047802ca0.tar.lz nixpkgs-2e73e2ae79ea17c39d095c7a529f4a1047802ca0.tar.xz nixpkgs-2e73e2ae79ea17c39d095c7a529f4a1047802ca0.tar.zst nixpkgs-2e73e2ae79ea17c39d095c7a529f4a1047802ca0.zip | |
modemmanager: Patch glib header dependency, fixes modemmanager-qt build
Diffstat (limited to 'pkgs/tools/networking/modemmanager/default.nix')
| -rw-r--r-- | pkgs/tools/networking/modemmanager/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 922ad50553c..c1bde0fa1cf 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig -, libmbim, libqmi, systemd, glib }: +, libmbim, libqmi, systemd, fetchpatch }: stdenv.mkDerivation rec { name = "ModemManager-${version}"; @@ -12,7 +12,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext pkgconfig ]; - buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd glib ]; + buildInputs = [ udev libgudev polkit dbus-glib 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 = "00m7ly1fgspapzkbvjsp25w58wcdax8rrwgvq3axrz4lagwfwnp6"; + }) + ]; configureFlags = [ "--with-polkit" |