Author: raskin
Date: Fri Jul 1 07:01:46 2011
New Revision: 27566
URL: https://svn.nixos.org/websvn/nix/?rev=27566&sc=1
Log:
Update Tulip
Modified:
nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix
Modified: nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix Thu Jun
30 15:48:40 2011 (r27565)
+++ nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix Fri Jul
1 07:01:46 2011 (r27566)
@@ -1,29 +1,17 @@
{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt
-, autoconf, automake, libtool }:
+, autoconf, automake, libtool, cmake }:
-let version = "3.4.0"; in
+let version = "3.5.0"; in
stdenv.mkDerivation rec {
name = "tulip-${version}";
src = fetchurl {
- url = "mirror://sourceforge/auber/tulip/tulip-${version}/${name}.tar.bz2";
- sha256 =
"2889113f773ba539472d501fb4f45dbf5eb76e02c949dfa74c63f6f815a2baab";
+ url =
"mirror://sourceforge/auber/tulip/tulip-${version}/${name}-src.tar.gz";
+ sha256 = "0wl0wqjlifpay61pn7dxr3dl5r4a7v80f5g277p6s06ibvn2p3ln";
};
- patches = [ ./configure-opengl.patch ];
-
- preConfigure =
- '' export CPATH="${mesa}/include:${glew}/include"
- export LIBRARY_PATH="${mesa}/lib:${glew}/lib"
- export QTDIR="${qt}"
- export LDFLAGS="-lGLEW"
-
- rm -vf aclocal.m4 ltmain.sh
- autoreconf -fi
- '';
-
buildInputs = [ libxml2 freetype glew ]
- ++ [ autoconf automake libtool ];
+ ++ [ autoconf automake libtool cmake qt ];
propagagedBuildInputs = [ mesa qt ];
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
