From c03fbc7db8099365a1c9034f5fa663b11954cdb0 Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Mon, 18 Jul 2022 13:21:23 +0300 Subject: [PATCH] p4est: fixed versioning (#180737) --- .../libraries/science/math/p4est/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/p4est/default.nix b/pkgs/development/libraries/science/math/p4est/default.nix index c38b0d623bac..9396a9144423 100644 --- a/pkgs/development/libraries/science/math/p4est/default.nix +++ b/pkgs/development/libraries/science/math/p4est/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config , p4est-withMetis ? true, metis , p4est-sc }: @@ -31,9 +34,11 @@ stdenv.mkDerivation { postPatch = '' sed -i -e "s:\(^\s*ACLOCAL_AMFLAGS.*\)\s@P4EST_SC_AMFLAGS@\s*$:\1 -I ${p4est-sc}/share/aclocal:" Makefile.am ''; - preConfigure = '' + preAutoreconf = '' echo "2.8.0" > .tarball-version - ${if mpiSupport then "unset CC" else ""} + ''; + preConfigure = lib.optionalString mpiSupport '' + unset CC ''; configureFlags = p4est-sc.configureFlags