diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2011-07-01 07:01:46 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2011-07-01 07:01:46 +0000 |
| commit | a4be010d3144cd728f08bd189a85478bf387902e (patch) | |
| tree | b65b6e3d8f48813804c38c1073aac5d0ade2eace /pkgs/applications/science/misc | |
| parent | aa16cb5f11e055febfa98bfb4d4ec581a0bb4d23 (diff) | |
| download | nixlib-a4be010d3144cd728f08bd189a85478bf387902e.tar nixlib-a4be010d3144cd728f08bd189a85478bf387902e.tar.gz nixlib-a4be010d3144cd728f08bd189a85478bf387902e.tar.bz2 nixlib-a4be010d3144cd728f08bd189a85478bf387902e.tar.lz nixlib-a4be010d3144cd728f08bd189a85478bf387902e.tar.xz nixlib-a4be010d3144cd728f08bd189a85478bf387902e.tar.zst nixlib-a4be010d3144cd728f08bd189a85478bf387902e.zip | |
Update Tulip
svn path=/nixpkgs/trunk/; revision=27566
Diffstat (limited to 'pkgs/applications/science/misc')
| -rw-r--r-- | pkgs/applications/science/misc/tulip/default.nix | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 3bca42023e9f..884ac4a4c1cf 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -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. |