diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-02 18:36:04 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-02 18:36:04 +0000 |
commit | 995d3d3e035d8d3dfaccab82a19831d7d0b3aeb8 (patch) | |
tree | c8c5fb7c8dd4a8a58848494f2bfe7daf1c752fcd /pkgs | |
parent | 709ae01f34cab8c6c623f750aad34f88eff6cb3d (diff) | |
download | nixlib-995d3d3e035d8d3dfaccab82a19831d7d0b3aeb8.tar nixlib-995d3d3e035d8d3dfaccab82a19831d7d0b3aeb8.tar.gz nixlib-995d3d3e035d8d3dfaccab82a19831d7d0b3aeb8.tar.bz2 nixlib-995d3d3e035d8d3dfaccab82a19831d7d0b3aeb8.tar.lz nixlib-995d3d3e035d8d3dfaccab82a19831d7d0b3aeb8.tar.xz nixlib-995d3d3e035d8d3dfaccab82a19831d7d0b3aeb8.tar.zst nixlib-995d3d3e035d8d3dfaccab82a19831d7d0b3aeb8.zip |
tulip-3.6.1
svn path=/nixpkgs/trunk/; revision=31216
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/science/misc/tulip/default.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 14 deletions
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index b213c14cc1a5..c3e39145dd81 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,22 +1,18 @@ -{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt -, autoconf, automake, libtool, cmake, makeWrapper }: +{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4 +, cmake, makeWrapper }: -let version = "3.5.0"; in +let version = "3.6.1"; in stdenv.mkDerivation rec { name = "tulip-${version}"; src = fetchurl { - url = "mirror://sourceforge/auber/tulip/tulip-${version}/${name}-src.tar.gz"; - sha256 = "0wl0wqjlifpay61pn7dxr3dl5r4a7v80f5g277p6s06ibvn2p3ln"; + url = "mirror://sourceforge/auber/${name}-src.tar.gz"; + sha256 = "0d76zmp7gmid4lc91zz6sp4rzxlga6vfwfqhap04326r4zl4nx1q"; }; - buildInputs = [ libxml2 freetype glew ] - ++ [ autoconf automake libtool cmake qt makeWrapper ]; - propagagedBuildInputs = [ mesa qt ]; + buildInputs = [ libxml2 freetype glew mesa qt4 ]; - postInstall='' - wrapProgram "$out/bin/tulip" - ''; + buildNativeInputs = [ cmake makeWrapper ]; # FIXME: "make check" needs Docbook's DTD 4.4, among other things. doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbc4a70b948e..15cfd3398e54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8327,9 +8327,7 @@ let simgrid = callPackage ../applications/science/misc/simgrid { }; - tulip = callPackage ../applications/science/misc/tulip { - qt = qt46; - }; + tulip = callPackage ../applications/science/misc/tulip { }; vite = callPackage ../applications/science/misc/vite { qt = qt4; |