summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-08-14 14:01:27 +0200
committerGitHub <noreply@github.com>2018-08-14 14:01:27 +0200
commitd6b9ab68655915d091ee5efa66bea33f77ee60fe (patch)
tree0a02b48ac1df05e2dc2aa34b32bb85064ffbd069
parent849b27c62b64384d69c1bec0ef368225192ca096 (diff)
parentbe81e1e29c895e50a6e6d355da4a8ae00fbf0fad (diff)
downloadnixlib-d6b9ab68655915d091ee5efa66bea33f77ee60fe.tar
nixlib-d6b9ab68655915d091ee5efa66bea33f77ee60fe.tar.gz
nixlib-d6b9ab68655915d091ee5efa66bea33f77ee60fe.tar.bz2
nixlib-d6b9ab68655915d091ee5efa66bea33f77ee60fe.tar.lz
nixlib-d6b9ab68655915d091ee5efa66bea33f77ee60fe.tar.xz
nixlib-d6b9ab68655915d091ee5efa66bea33f77ee60fe.tar.zst
nixlib-d6b9ab68655915d091ee5efa66bea33f77ee60fe.zip
Merge pull request #45008 from jbaum98/gfan-darwin
gfan: Add darwin support
-rw-r--r--pkgs/applications/science/math/gfan/default.nix11
-rw-r--r--pkgs/development/libraries/cddlib/default.nix2
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix
index 65d551f39a71..d2d1ddb65846 100644
--- a/pkgs/applications/science/math/gfan/default.nix
+++ b/pkgs/applications/science/math/gfan/default.nix
@@ -9,15 +9,20 @@ stdenv.mkDerivation rec {
     sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56";
   };
 
-  makeFlags = ''PREFIX=$(out) CC=cc CXX=c++ cddnoprefix=1'';
-  buildInputs = [gmp mpir cddlib];
+  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace Makefile --replace "-fno-guess-branch-probability" ""
+  '';
+
+  buildFlags = [ "CC=cc" "CXX=c++" "cddnoprefix=1" ];
+  installFlags = [ ''PREFIX=$(out)'' ];
+  buildInputs = [ gmp mpir cddlib ];
 
   meta = {
     inherit version;
     description = ''A software package for computing Gröbner fans and tropical varieties'';
     license = stdenv.lib.licenses.gpl2 ;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     homepage = http://home.math.au.dk/jensen/software/gfan/gfan.html;
   };
 }
diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix
index 058ee893c37a..68d34c75c010 100644
--- a/pkgs/development/libraries/cddlib/default.nix
+++ b/pkgs/development/libraries/cddlib/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron'';
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [raskin timokau];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     homepage = https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html;
   };
 }