diff options
author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2020-07-20 19:41:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-20 19:41:37 +0200 |
commit | e3cba5aad991a0f355545fc0b069cbf987b577d0 (patch) | |
tree | 6530ae0f4ecd05a361398423c7452df39adca8ad /pkgs | |
parent | 29711bb90541363a7dc8b56328aa08f38dd3b773 (diff) | |
parent | d6b3707c862b6bb82712bd86cd12b163fa89adcc (diff) | |
download | nixpkgs-e3cba5aad991a0f355545fc0b069cbf987b577d0.tar nixpkgs-e3cba5aad991a0f355545fc0b069cbf987b577d0.tar.gz nixpkgs-e3cba5aad991a0f355545fc0b069cbf987b577d0.tar.bz2 nixpkgs-e3cba5aad991a0f355545fc0b069cbf987b577d0.tar.lz nixpkgs-e3cba5aad991a0f355545fc0b069cbf987b577d0.tar.xz nixpkgs-e3cba5aad991a0f355545fc0b069cbf987b577d0.tar.zst nixpkgs-e3cba5aad991a0f355545fc0b069cbf987b577d0.zip |
Merge pull request #93487 from siriobalmelli-foss/add/pc-ble-driver
pc-ble-driver: fix Darwin build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/pc-ble-driver/default.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix index 9f2c9748036..7d7dbd53383 100644 --- a/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/pkgs/development/libraries/pc-ble-driver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev }: +{ stdenv, fetchFromGitHub, git, cmake, catch2, asio, udev, IOKit }: stdenv.mkDerivation rec { pname = "pc-ble-driver"; @@ -16,7 +16,15 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake git ]; - buildInputs = [ catch2 asio udev ]; + buildInputs = [ catch2 asio ]; + + propagatedBuildInputs = [ + + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + IOKit + ] ++ stdenv.lib.optionals stdenv.isLinux [ + udev + ]; meta = with stdenv.lib; { description = "Desktop library for Bluetooth low energy development"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d685db4d920..64f38c72684 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21433,7 +21433,9 @@ in partio = callPackage ../development/libraries/partio {}; - pc-ble-driver = callPackage ../development/libraries/pc-ble-driver {}; + pc-ble-driver = callPackage ../development/libraries/pc-ble-driver { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; pbis-open = callPackage ../tools/security/pbis { }; |