public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67290 from Ma27/bump-dlib

Browse Source 
dlib: 19.16 -> 19.17
This commit is contained in:
Marek Mahut
2019-08-25 14:15:31 +02:00
committed by GitHub
parent 9a733a88d9 311516f55e
commit 7bdda407bb
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/dlib/default.nix
View File

@@ -1,4 +1,4 @@
{ buildPythonPackage, dlib, python, pytest, avxSupport ? true }:
{ buildPythonPackage, dlib, python, pytest, more-itertools, avxSupport ? true, lib }:
buildPythonPackage {
inherit (dlib) name src nativeBuildInputs buildInputs meta;
@@ -10,9 +10,15 @@ buildPythonPackage {
${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS
'';
setupPyBuildFlags = [ "--${if avxSupport then "yes" else "no"} USE_AVX_INSTRUCTIONS" ];
setupPyBuildFlags = lib.optional avxSupport "--no USE_AVX_INSTRUCTIONS";
patches = [ ./build-cores.patch ];
checkInputs = [ pytest ];
postPatch = ''
substituteInPlace setup.py \
--replace "more-itertools<6.0.0" "more-itertools" \
--replace "pytest==3.8" "pytest"
'';
checkInputs = [ pytest more-itertools ];
}