From 72ec538d2c76180a8d0f79a13b88794d6efe06a7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Sep 2019 13:42:06 +0200 Subject: [PATCH 1/2] python3Packages.dlib: fix build The CMake configuring is done in the `setup.py` and doesn't need to be done by the setup hook. This broke the build as the setup-hook switches into `source/build` which doesn't have a `setup.py`. Relying on the setup script from upstream fixes the issue. ZHF #68361 --- pkgs/development/python-modules/dlib/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index d9b3bb93264e..a57d83075513 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -21,4 +21,7 @@ buildPythonPackage { ''; checkInputs = [ pytest more-itertools ]; + + enableParallelBuilding = true; + dontUseCmakeConfigure = true; } From e176117a81eb83eca4ec6eafdeedbbbdea7cb7fa Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Sep 2019 13:59:20 +0200 Subject: [PATCH 2/2] python3Packages.face_recognition_models: fix startup --- .../python-modules/face_recognition_models/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix index 960bffb903d6..12587e6792df 100644 --- a/pkgs/development/python-modules/face_recognition_models/default.nix +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, stdenv, fetchPypi }: +{ buildPythonPackage, stdenv, fetchPypi, setuptools }: buildPythonPackage rec { pname = "face_recognition_models"; @@ -12,6 +12,8 @@ buildPythonPackage rec { # no module named `tests` as no tests are available doCheck = false; + propagatedBuildInputs = [ setuptools ]; + meta = with stdenv.lib; { homepage = https://github.com/ageitgey/face_recognition_models; license = licenses.cc0;