Author: urkud
Date: Mon Aug 15 18:05:10 2011
New Revision: 28592
URL: https://svn.nixos.org/websvn/nix/?rev=28592&sc=1
Log:
qhull-2011.1, use cmake
Modified:
nixpkgs/trunk/pkgs/development/libraries/qhull/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/qhull/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/qhull/default.nix Mon Aug 15
18:05:04 2011 (r28591)
+++ nixpkgs/trunk/pkgs/development/libraries/qhull/default.nix Mon Aug 15
18:05:10 2011 (r28592)
@@ -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/;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
