Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 849b27c62b64
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d6b9ab686559
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 14, 2018

  1. gfan: Add darwin support

    @jbaum98
    jbaum98 committed Aug 14, 2018
    Copy the full SHA
    be81e1e View commit details

  2. Merge pull request #45008 from jbaum98/gfan-darwin 

    gfan: Add darwin support
    @Mic92
    Mic92 authored Aug 14, 2018
    Copy the full SHA
    d6b9ab6 View commit details
Showing with 9 additions and 4 deletions.
  1. +8 −3 pkgs/applications/science/math/gfan/default.nix
  2. +1 −1 pkgs/development/libraries/cddlib/default.nix
11 changes: 8 additions & 3 deletions pkgs/applications/science/math/gfan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/development/libraries/cddlib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}