diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/libraries/pc-ble-driver | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pc-ble-driver')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix b/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix index 1777b0856f80..5f09860cb3a4 100644 --- a/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }: +{ lib, stdenv, fetchFromGitHub +, cmake, git +, asio, catch2, spdlog +, IOKit, udev +}: stdenv.mkDerivation rec { pname = "pc-ble-driver"; - version = "4.1.1"; + version = "4.1.4"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-ble-driver"; rev = "v${version}"; - sha256 = "1llhkpbdbsq9d91m873vc96bprkgpb5wsm5fgs1qhzdikdhg077q"; + sha256 = "1609x17sbfi668jfwyvnfk9z29w6cgzvgv67xcpvpx5jv0czpcdj"; }; cmakeFlags = [ @@ -16,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake git ]; - buildInputs = [ catch2 asio ]; + buildInputs = [ asio catch2 spdlog ]; propagatedBuildInputs = [ |