From 10b412cba8f5ec3890bdfc02e352abb92507dd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 2 Jun 2019 10:58:27 +0200 Subject: [PATCH] pybind11: Fix build --- pkgs/development/libraries/pybind11/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix index 0a8972d4876..aa1f8d10ba9 100644 --- a/pkgs/development/libraries/pybind11/default.nix +++ b/pkgs/development/libraries/pybind11/default.nix @@ -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;