From a82378a76a28e0da67572cda4dc1f04eed0af9d9 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Mon, 11 Apr 2022 10:38:44 +0200 Subject: [PATCH 1/2] pcmsolver: fix glibc >= 2.34 compatibility related to https://github.com/PCMSolver/pcmsolver/issues/197. This is a temporary workaround until we have a proper fix from upstream --- pkgs/development/libraries/pcmsolver/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/development/libraries/pcmsolver/default.nix index dd94a4a088cb0..2b04274d43ba9 100644 --- a/pkgs/development/libraries/pcmsolver/default.nix +++ b/pkgs/development/libraries/pcmsolver/default.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { sha256= "0jrxr8z21hjy7ik999hna9rdqy221kbkl3qkb06xw7g80rc9x9yr"; }; + # Glibc 2.34 changed SIGSTKSZ to a dynamic value, which breaks + # PCMsolver. Replace SIGSTKZ by the backward-compatible _SC_SIGSTKSZ. + postPatch = '' + substituteInPlace external/Catch/catch.hpp \ + --replace SIGSTKSZ _SC_SIGSTKSZ + ''; + nativeBuildInputs = [ cmake gfortran From 2c1e621741d74d88b8983cfb186713f6b5925c43 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Mon, 11 Apr 2022 10:39:41 +0200 Subject: [PATCH 2/2] pcmsolver: replace python2 by python3 as build dependency --- pkgs/development/libraries/pcmsolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/development/libraries/pcmsolver/default.nix index 2b04274d43ba9..a957d517bf7a8 100644 --- a/pkgs/development/libraries/pcmsolver/default.nix +++ b/pkgs/development/libraries/pcmsolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python2 +{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python3 , boost, eigen, zlib } : @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmake gfortran perl - python2 + python3 ]; buildInputs = [