python3Packages.pybind11: 2.4.3 -> 2.5.0
This commit is contained in:
parent
3a57356721
commit
72d4d15d77
|
@ -1,53 +0,0 @@
|
|||
From a027e2590d5d2d384d23568a8d47b7095054b6b7 Mon Sep 17 00:00:00 2001
|
||||
From: Frederik Rietdijk <fridh@fridh.nl>
|
||||
Date: Thu, 19 Dec 2019 19:51:07 +0100
|
||||
Subject: [PATCH] Find include directory
|
||||
|
||||
---
|
||||
pybind11/__init__.py | 33 +--------------------------------
|
||||
1 file changed, 1 insertion(+), 32 deletions(-)
|
||||
|
||||
diff --git a/pybind11/__init__.py b/pybind11/__init__.py
|
||||
index c625e8c..c8a707b 100644
|
||||
--- a/pybind11/__init__.py
|
||||
+++ b/pybind11/__init__.py
|
||||
@@ -2,35 +2,4 @@ from ._version import version_info, __version__ # noqa: F401 imported but unuse
|
||||
|
||||
|
||||
def get_include(user=False):
|
||||
- from distutils.dist import Distribution
|
||||
- import os
|
||||
- import sys
|
||||
-
|
||||
- # Are we running in a virtual environment?
|
||||
- virtualenv = hasattr(sys, 'real_prefix') or \
|
||||
- sys.prefix != getattr(sys, "base_prefix", sys.prefix)
|
||||
-
|
||||
- # Are we running in a conda environment?
|
||||
- conda = os.path.exists(os.path.join(sys.prefix, 'conda-meta'))
|
||||
-
|
||||
- if virtualenv:
|
||||
- return os.path.join(sys.prefix, 'include', 'site',
|
||||
- 'python' + sys.version[:3])
|
||||
- elif conda:
|
||||
- if os.name == 'nt':
|
||||
- return os.path.join(sys.prefix, 'Library', 'include')
|
||||
- else:
|
||||
- return os.path.join(sys.prefix, 'include')
|
||||
- else:
|
||||
- dist = Distribution({'name': 'pybind11'})
|
||||
- dist.parse_config_files()
|
||||
-
|
||||
- dist_cobj = dist.get_command_obj('install', create=True)
|
||||
-
|
||||
- # Search for packages in user's home directory?
|
||||
- if user:
|
||||
- dist_cobj.user = user
|
||||
- dist_cobj.prefix = ""
|
||||
- dist_cobj.finalize_options()
|
||||
-
|
||||
- return os.path.dirname(dist_cobj.install_headers)
|
||||
+ return "@include@"
|
||||
--
|
||||
2.23.0
|
||||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybind11";
|
||||
version = "2.4.3";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pybind";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0k89w4bsfbpzw963ykg1cyszi3h3nk393qd31m6y46pcfxkqh4rd";
|
||||
sha256 = "13hcj6g7k7yvj7nry2ar6f5mg58ln7frrvq1cg5f8mczxh1ch6zl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -40,14 +40,6 @@ buildPythonPackage rec {
|
|||
dontUsePipInstall = true;
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
||||
patches = [
|
||||
./0001-Find-include-directory.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pybind11/__init__.py --subst-var-by include "$out/include"
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
pushd ..
|
||||
export PYBIND11_USE_CMAKE=1
|
||||
|
@ -65,7 +57,7 @@ buildPythonPackage rec {
|
|||
scipy
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pybind/pybind11";
|
||||
description = "Seamless operability between C++11 and Python";
|
||||
longDescription = ''
|
||||
|
@ -73,7 +65,7 @@ buildPythonPackage rec {
|
|||
C++ types in Python and vice versa, mainly to create Python
|
||||
bindings of existing C++ code.
|
||||
'';
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.yuriaisaka ];
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers;[ yuriaisaka ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue