diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-15 18:05:10 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-15 18:05:10 +0000 |
| commit | 6dc8b7351a6c53ddff09f7e448d7a00e6d55da8e (patch) | |
| tree | fddcf1fee3f835abba91137d6509011a65a84e79 /pkgs/development/libraries/qhull | |
| parent | 7a80e467cfbbfed437249a7e0ffe58c1876d2aaa (diff) | |
qhull-2011.1, use cmake
svn path=/nixpkgs/trunk/; revision=28592
Diffstat (limited to 'pkgs/development/libraries/qhull')
| -rw-r--r-- | pkgs/development/libraries/qhull/default.nix | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 8f9bfc6c130c..002a25988b69 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,29 +1,16 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, cmake}: + +stdenv.mkDerivation rec { + name = "qhull-2011.1"; -stdenv.mkDerivation { - name = "qhull-2010.1"; src = fetchurl { - url = http://www.qhull.org/download/qhull-2010.1-src.tgz; - sha256 = "1ghnwci1s56yzzwg8gmlzhsd5v3imsqxf24yb0j5m6qv8kxqaw2m"; + url = "${meta.homepage}/download/${name}-src.tgz"; + sha256 = "1i2lqw0552mvbcc1q7l4b31fpzf2l2qcabc23r4sybhwyljl9bmd"; }; - NIX_CFLAGS_COMPILE = "-fno-strict-aliasing " + - (if stdenv.system == "x86_64-linux" then "-fPIC" else ""); - - patchPhase = '' - cd src - sed -i -e "s@/usr/local@$out@" Makefile; - sed -i -e "s@man/man1@share/man/man1@" Makefile; - ''; + buildNativeInputs = [ cmake ]; - installPhase = '' - ensureDir $out/bin - ensureDir $out/include/qhull - ensureDir $out/lib - cp qconvex qdelaunay qhalf qhull rbox qvoronoi $out/bin - cp *.h $out/include/qhull - cp libqhull.a $out/lib - ''; + cmakeFlags = "-DMAN_INSTALL_DIR=share/man/man1 -DDOC_INSTALL_DIR=share/doc/qhull"; meta = { homepage = http://www.qhull.org/; |