summary refs log tree commit diff
path: root/pkgs/development/libraries/CGAL
diff options
context:
space:
mode:
authorndowens <ndowens04@gmail.com>2017-03-10 17:16:01 -0600
committerndowens <ndowens04@gmail.com>2017-03-10 17:16:01 -0600
commit0a72e457cca89e0e5d62b069c09bb426941e18ef (patch)
treec5e4a2ccfedf70f76e6871a2a69c255b7e65a107 /pkgs/development/libraries/CGAL
parent798623fd2b0bb85c355f7d40c57a4fc10b2c36a0 (diff)
downloadnixpkgs-0a72e457cca89e0e5d62b069c09bb426941e18ef.tar
nixpkgs-0a72e457cca89e0e5d62b069c09bb426941e18ef.tar.gz
nixpkgs-0a72e457cca89e0e5d62b069c09bb426941e18ef.tar.bz2
nixpkgs-0a72e457cca89e0e5d62b069c09bb426941e18ef.tar.lz
nixpkgs-0a72e457cca89e0e5d62b069c09bb426941e18ef.tar.xz
nixpkgs-0a72e457cca89e0e5d62b069c09bb426941e18ef.tar.zst
nixpkgs-0a72e457cca89e0e5d62b069c09bb426941e18ef.zip
cgal: 4.7 -> 4.9
Diffstat (limited to 'pkgs/development/libraries/CGAL')
-rw-r--r--pkgs/development/libraries/CGAL/default.nix18
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index b8fd4af812a..dc3909f6649 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, cmake, boost, gmp, mpfr, mesa_glu }:
+{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr, mesa_glu }:
 
 stdenv.mkDerivation rec {
-  version = "4.7";
+  version = "4.9";
   name = "cgal-" + version;
 
-  src = fetchurl {
-    url = "https://github.com/CGAL/releases/archive/CGAL-${version}.tar.gz";
-    sha256 = "1hbp4qpfqvpggvv79yxr6z3w7y0nwd31zavb1s57y55yl9z3zfxy";
+  src = fetchFromGitHub {
+    owner = "CGAL";
+    repo = "releases";
+    rev = "CGAL-${version}";
+    sha256 = "044amgml1x5h17rpkck2azmxrmjvlzzykv71cjh5hlajsi88cid5";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;
   #   there are also libCGAL_Qt{3,4} omitted ATM
-  buildInputs = [ cmake boost gmp mpfr ];
-  #propagatedBuildInputs = [ mesa_glu ];
+  buildInputs = [ boost gmp mpfr ];
+  nativeBuildInputs = [ cmake ];
 
   doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Computational Geometry Algorithms Library";
     homepage = http://cgal.org;
-    license = licenses.gpl3Plus; # some parts are GPLv3+, some are LGPLv3+
+    license = with licenses; [ gpl3Plus lglp3Plus];
     platforms = platforms.all;
     maintainers = [ maintainers.raskin ];
   };