diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-12-07 12:03:59 +0100 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2019-12-07 12:04:39 +0100 |
| commit | 56dabf8cf2f0b0bf44cbe5d4e6ce2378e13bf71a (patch) | |
| tree | b59f559e94a05f3e8be8853fe1dc644e14568129 | |
| parent | 4d9ccae6324153f5fda641db6f52d8d68a4c6186 (diff) | |
| download | nixpkgs-56dabf8cf2f0b0bf44cbe5d4e6ce2378e13bf71a.tar nixpkgs-56dabf8cf2f0b0bf44cbe5d4e6ce2378e13bf71a.tar.gz nixpkgs-56dabf8cf2f0b0bf44cbe5d4e6ce2378e13bf71a.tar.bz2 nixpkgs-56dabf8cf2f0b0bf44cbe5d4e6ce2378e13bf71a.tar.lz nixpkgs-56dabf8cf2f0b0bf44cbe5d4e6ce2378e13bf71a.tar.xz nixpkgs-56dabf8cf2f0b0bf44cbe5d4e6ce2378e13bf71a.tar.zst nixpkgs-56dabf8cf2f0b0bf44cbe5d4e6ce2378e13bf71a.zip | |
cgal: 4.14 -> 4.14.2, add (incompatible) cgal_5
| -rw-r--r-- | pkgs/development/libraries/CGAL/4.nix | 28 | ||||
| -rw-r--r-- | pkgs/development/libraries/CGAL/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 34 insertions, 3 deletions
diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix new file mode 100644 index 00000000000..60c244009ce --- /dev/null +++ b/pkgs/development/libraries/CGAL/4.nix @@ -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 ]; + }; +} diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 95984c97001..d2d74769a1f 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.14"; + version = "5.0"; name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "0p0s1dl5a261zwy0hxa7ylkypk45rwc6n84lx507dwdhfz4ihv12"; + sha256 = "15r631kddphw3wsvrxrkdbq9y7m0q8kx0kwc9zq97x6ksg3v0gs3"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index daeffc6bbaa..9810986b89b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10872,7 +10872,10 @@ in 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 {}; |