diff options
author | Orivej Desh <orivej@gmx.fr> | 2018-08-09 02:26:02 +0000 |
---|---|---|
committer | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2018-08-09 02:26:02 +0000 |
commit | 6fd962ed335577829031acd281cc061612759e66 (patch) | |
tree | b1ca3e817677bc00540e12dbc407f940d7925847 /pkgs/development/libraries/qhull/default.nix | |
parent | 752284680bf63a142a1f3779b2693126ada70229 (diff) | |
download | nixlib-6fd962ed335577829031acd281cc061612759e66.tar nixlib-6fd962ed335577829031acd281cc061612759e66.tar.gz nixlib-6fd962ed335577829031acd281cc061612759e66.tar.bz2 nixlib-6fd962ed335577829031acd281cc061612759e66.tar.lz nixlib-6fd962ed335577829031acd281cc061612759e66.tar.xz nixlib-6fd962ed335577829031acd281cc061612759e66.tar.zst nixlib-6fd962ed335577829031acd281cc061612759e66.zip |
qhull: 2012.1 -> 2016.1 (#44773)
Diffstat (limited to 'pkgs/development/libraries/qhull/default.nix')
-rw-r--r-- | pkgs/development/libraries/qhull/default.nix | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 829765d85499..596dc543e335 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,28 +1,22 @@ -{stdenv, fetchurl, cmake}: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "qhull-2012.1"; + name = "qhull-2016.1"; - src = fetchurl { - url = "${meta.homepage}/download/${name}-src.tgz"; - sha256 = "127zpjp6sm8c101hz239k82lpxqcqf4ksdyfqc2py2sm22kclpm3"; + src = fetchFromGitHub { + owner = "qhull"; + repo = "qhull"; + rev = "5bbc75608c817b50383a0c24c3977cc09d0bbfde"; + sha256 = "0wrgqc2mih7h8fs9v5jcn9dr56afqi9bgh2w9dcvzvzvxizr9kjj"; }; nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DMAN_INSTALL_DIR=share/man/man1 -DDOC_INSTALL_DIR=share/doc/qhull"; - - hardeningDisable = [ "format" ]; - - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }/#include <iterator>/' ./src/libqhullcpp/QhullIterator.h - sed -i 's/namespace std { struct bidirectional_iterator_tag; struct random_access_iterator_tag; }/#include <iterator>/' ./src/libqhullcpp/QhullLinkedList.h - ''; - - meta = { + meta = with stdenv.lib; { homepage = http://www.qhull.org/; - description = "Computes the convex hull, Delaunay triangulation, Voronoi diagram and more"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; + description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more"; + license = licenses.free; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej ]; }; } |