diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
| commit | 7d648ac22d941d0c7efdd987315ae0ddf9932ba0 (patch) | |
| tree | 51a3e8126722c5a52a9a1e7e40b4eeaf4610db0b /nixpkgs/pkgs/development/libraries/libmbim/default.nix | |
| parent | aa4353b499e6950b7333578f936455a628145c31 (diff) | |
| parent | db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b (diff) | |
| download | nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.gz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.bz2 nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.lz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.xz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.zst nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libmbim/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libmbim/default.nix | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/nixpkgs/pkgs/development/libraries/libmbim/default.nix index c55b0876ce61..896c8b8fe4ee 100644 --- a/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -31,6 +32,24 @@ stdenv.mkDerivation rec { hash = "sha256-aaYjvJ2OMTzkUyqWCyHdmsKJ3VGqBmKQzb1DWK/1cPU="; }; + patches = [ + # Intel Mutual Authentication - FCC lock. Part of 1.30, backported to + # openSUSE and Fedora and ChromeOS. + # https://src.fedoraproject.org/rpms/libmbim/blob/rawhide/f/libmbim.spec + (fetchpatch { + url = "https://cgit.freedesktop.org/libmbim/libmbim/patch/?id=910db9cb2b6fde303d3b4720890cf6dc6fc00880"; + hash = "sha256-412sXdWb8WsSexe1scI/C57dwENgNWoREGO1GxSF4hs="; + }) + + # Intel Tools. Allows tracing various commands. Part of 1.30, backported to + # openSUSE, Fedora and ChromeOS. + # https://src.fedoraproject.org/rpms/libmbim/blob/rawhide/f/libmbim.spec + (fetchpatch { + url = "https://cgit.freedesktop.org/libmbim/libmbim/patch/?id=8a6dec6ed11931601e605c9537da9904b3be5bc0"; + hash = "sha256-tU4zkUl5aZJE+g/qbnWprUHe/PmZvqVKB9qecSaUBhk="; + }) + ]; + mesonFlags = [ "-Dudevdir=${placeholder "out"}/lib/udev" (lib.mesonBool "introspection" withIntrospection) |