Merge pull request #62488 from knedlsepp/fix-pybind11

pybind11: Fix build
This commit is contained in:
Mario Rodas 2019-06-02 12:01:33 -05:00 committed by GitHub
commit f6840be5d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, catch, python, eigen }:
{ stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }:
stdenv.mkDerivation rec {
name = "pybind-${version}";
@ -16,7 +16,14 @@ stdenv.mkDerivation rec {
# Disable test_cmake_build test, as it fails in sandbox
# https://github.com/pybind/pybind11/issues/1355
patches = [ ./no_test_cmake_build.patch ];
patches = [
./no_test_cmake_build.patch
(fetchurl { # Remove on bump to v2.2.5
name = "pytest_namespace_to_configure.patch";
url = "https://github.com/pybind/pybind11/commit/e7ef34f23f194cfa40bdbf967c6d34712261a4ee.patch";
sha256 = "1dhv6p0b5fxzxc8j3sfy8kvfmdshczk22xfxh6bk0cfnfdy9iqrq";
})
];
doCheck = true;