From d82b7b86904424c27e28c7caf26ca6880149d33b Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Mon, 13 Jul 2020 13:50:05 +0200 Subject: [PATCH] pc-ble-driver-py: 0.11.4 -> 0.14.2 --- .../pc-ble-driver-py/default.nix | 40 +++++-------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index d21d9d07150..c8967fa5eab 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -1,45 +1,25 @@ -{ stdenv, buildPythonPackage, fetchpatch, fetchFromGitHub, - python, cmake, git, swig, boost, udev, - setuptools, enum34, wrapt, future }: +{ stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver +, buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build }: buildPythonPackage rec { pname = "pc-ble-driver-py"; - version = "0.11.4"; - disabled = python.isPy3k; + version = "0.14.2"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; rev = "v${version}"; - fetchSubmodules = true; - sha256 = "0lgmcnrlcivmawmlcwnn4pdp6afdbnf3fyfgq22xzs6v72m9gp81"; + sha256 = "1zbi3v4jmgq1a3ml34dq48y1hinw2008vwqn30l09r5vqvdgnj8m"; }; - nativeBuildInputs = [ cmake swig git setuptools ]; - buildInputs = [ boost udev ]; + # doCheck tries to write to the global python directory to install things + doCheck = false; + + nativeBuildInputs = [ cmake swig git setuptools scikit-build ]; + buildInputs = [ boost udev pc-ble-driver ]; propagatedBuildInputs = [ enum34 wrapt future ]; - patches = [ - # build system expects case-insensitive file system - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/NordicSemiconductor/pc-ble-driver-py/pull/84.patch"; - sha256 = "0ibx5g2bndr5h9sfnx51bk9b62q4jvpdwhxadbnj3da8kvcz13cy"; - }) - ]; - - postPatch = '' - # do not force static linking of boost - sed -i /Boost_USE_STATIC_LIBS/d pc-ble-driver/cmake/*.cmake - - cd python - ''; - - preBuild = '' - pushd ../build - cmake .. - make -j $NIX_BUILD_CORES - popd - ''; + dontUseCmakeConfigure = true; meta = with stdenv.lib; { description = "Bluetooth Low Energy nRF5 SoftDevice serialization";