Author: raskin
Date: Fri Jul 1 09:53:11 2011
New Revision: 27570
URL: https://svn.nixos.org/websvn/nix/?rev=27570&sc=1
Log:
Make tulip run without hassle. Unfortunately, some operations repeatably crash
tulip even when built vs Qt4.6
Deleted:
nixpkgs/trunk/pkgs/applications/science/misc/tulip/configure-opengl.patch
Modified:
nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix Fri Jul
1 09:50:34 2011 (r27569)
+++ nixpkgs/trunk/pkgs/applications/science/misc/tulip/default.nix Fri Jul
1 09:53:11 2011 (r27570)
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt
-, autoconf, automake, libtool, cmake }:
+, autoconf, automake, libtool, cmake, makeWrapper }:
let version = "3.5.0"; in
stdenv.mkDerivation rec {
@@ -11,9 +11,13 @@
};
buildInputs = [ libxml2 freetype glew ]
- ++ [ autoconf automake libtool cmake qt ];
+ ++ [ autoconf automake libtool cmake qt makeWrapper ];
propagagedBuildInputs = [ mesa qt ];
+ postInstall=''
+ wrapProgram "$out/bin/tulip"
+ '';
+
# FIXME: "make check" needs Docbook's DTD 4.4, among other things.
doCheck = false;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 1 09:50:34
2011 (r27569)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 1 09:53:11
2011 (r27570)
@@ -7821,7 +7821,7 @@
simgrid = callPackage ../applications/science/misc/simgrid { };
tulip = callPackage ../applications/science/misc/tulip {
- qt = qt4;
+ qt = qt46;
};
vite = callPackage ../applications/science/misc/vite {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
