public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cgal: 4.14 -> 4.14.2, add (incompatible) cgal_5

Browse Source
This commit is contained in:
Michael Raskin 2019-12-07 12:03:59 +01:00
parent 4d9ccae632
commit 56dabf8cf2
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/libraries/CGAL/4.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
stdenv.mkDerivation rec {
version = "4.14.2";
name = "cgal-" + version;
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
sha256 = "1p1xyws2s9h2c8hlkz1af4ix48qma160av24by6lcm8al1g44pca";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;
# there are also libCGAL_Qt{3,4} omitted ATM
buildInputs = [ boost gmp mpfr ];
nativeBuildInputs = [ cmake ];
doCheck = false;
meta = with stdenv.lib; {
description = "Computational Geometry Algorithms Library";
homepage = http://cgal.org;
license = with licenses; [ gpl3Plus lgpl3Plus];
platforms = platforms.all;
maintainers = [ maintainers.raskin ];
};
}

4
pkgs/development/libraries/CGAL/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.14"; version = "5.0";
name = "cgal-" + version; name = "cgal-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CGAL"; owner = "CGAL";
repo = "releases"; repo = "releases";
rev = "CGAL-${version}"; rev = "CGAL-${version}";
sha256 = "0p0s1dl5a261zwy0hxa7ylkypk45rwc6n84lx507dwdhfz4ihv12"; sha256 = "15r631kddphw3wsvrxrkdbq9y7m0q8kx0kwc9zq97x6ksg3v0gs3";
}; };
# note: optional component libCGAL_ImageIO would need zlib and opengl; # note: optional component libCGAL_ImageIO would need zlib and opengl;

5
pkgs/top-level/all-packages.nix
View File

@ -10872,7 +10872,10 @@ in
caf = callPackage ../development/libraries/caf {}; caf = callPackage ../development/libraries/caf {};
cgal = callPackage ../development/libraries/CGAL {}; # CGAL 5 has API changes
cgal_4 = callPackage ../development/libraries/CGAL/4.nix {};
cgal_5 = callPackage ../development/libraries/CGAL {};
cgal = cgal_4;
cgui = callPackage ../development/libraries/cgui {}; cgui = callPackage ../development/libraries/cgui {};