about summary refs log tree commit diff
path: root/pkgs/applications/science/math/gfan/default.nix
diff options
context:
space:
mode:
authorMasanori Ogino <167209+omasanori@users.noreply.github.com>2020-10-19 09:00:00 +0900
committerMasanori Ogino <167209+omasanori@users.noreply.github.com>2020-10-19 10:29:01 +0900
commit096ef947170de11130edaeeb29b7568b954b92d9 (patch)
tree3cf33ae9460060a9947bbef52f1ebb4fa2e73580 /pkgs/applications/science/math/gfan/default.nix
parent713c3682910623bfc973333b75fc38c5330e3be7 (diff)
gfan: fix build failures with cddlib v0.94l
It fixes https://github.com/NixOS/nixpkgs/issues/100622.

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
Diffstat (limited to 'pkgs/applications/science/math/gfan/default.nix')
-rw-r--r--pkgs/applications/science/math/gfan/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix
index adac92f376c8e..7e2a4625d3011 100644
--- a/pkgs/applications/science/math/gfan/default.nix
+++ b/pkgs/applications/science/math/gfan/default.nix
@@ -8,11 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56";
   };
 
-  patchPhase = stdenv.lib.optionalString stdenv.cc.isClang ''
+  patches = [
+    ./gfan-0.6.2-cddlib-prefix.patch
+  ];
+
+  postPatch = stdenv.lib.optionalString stdenv.cc.isClang ''
     substituteInPlace Makefile --replace "-fno-guess-branch-probability" ""
   '';
 
-  buildFlags = [ "CC=cc" "CXX=c++" "cddnoprefix=1" ];
+  buildFlags = [ "CC=cc" "CXX=c++" ];
   installFlags = [ ''PREFIX=$(out)'' ];
   buildInputs = [ gmp mpir cddlib ];