From c2cbd65668ba2cf3a6a707f18a382afb92034ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 4 Mar 2010 14:44:43 +0000 Subject: [PATCH] Getting a better seg3d build. Now it runs from TMPDIR at least. The installation still fails. svn path=/nixpkgs/trunk/; revision=20382 --- pkgs/applications/graphics/seg3d/default.nix | 32 +++++++++++++++++--- pkgs/top-level/all-packages.nix | 5 ++- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index 75a56ef2531..7cca0c8f8ab 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, cmake, wxGTK, itk, mesa, libXft, libXext, libXi, zlib, libXmu }: +{ fetchurl, stdenv, cmake, wxGTK, itk, mesa, libXft, libXext, libXi, zlib, libXmu, +libuuid }: assert (stdenv ? glibc); @@ -11,11 +12,29 @@ stdenv.mkDerivation { patches = [ ./cstdio.patch ]; - cmakeFlags = [ "-DM_LIBRARY=${stdenv.glibc}/lib/libm.so" - "-DDL_LIBRARY=${stdenv.glibc}/lib/libdl.so" ]; + cmakeFlags = [ + "-DM_LIBRARY=${stdenv.glibc}/lib/libm.so" + "-DDL_LIBRARY=${stdenv.glibc}/lib/libdl.so" + "-DBUILD_UTILS=1" + "-DBUILD_SEG3D=1" + "-DBUILD_DATAFLOW=0" + "-DBUILD_SHARED_LIBS=0" + "-DWITH_X11=1" + "-DBUILD_BIOMESH3D=1" + "-DWITH_TETGEN=1" + "-DBUILD_TYPE=Release" + "-DBUILD_TESTING=0" + "-DWITH_WXWIDGETS=ON" + "-DITK_DIR=${itk}/lib/InsightToolkit" + "-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a" + ]; + + + makeFlags = "VERBOSE=1"; preBuild = '' export LD_LIBRARY_PATH=`pwd`/lib + export NIX_LDFLAGS="$NIX_LDFLAGS -lGLU -lSM -lICE -lX11 -lXext -luuid"; ''; preUnpack = '' @@ -23,5 +42,10 @@ stdenv.mkDerivation { sourceRoot=`pwd`/src ''; - buildInputs = [ cmake wxGTK itk mesa libXft libXext libXi zlib libXmu ]; + postInstall = '' + cp Seg3D $out/bin + exit 1 + ''; + + buildInputs = [ cmake wxGTK itk mesa libXft libXext libXi zlib libXmu libuuid ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 349ff067ee1..a403f769b5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7967,8 +7967,11 @@ let }; seg3d = import ../applications/graphics/seg3d { - inherit fetchurl stdenv cmake wxGTK itk mesa zlib; + inherit fetchurl stdenv cmake itk mesa zlib libuuid; inherit (xlibs) libXft libXext libXi libXmu; + wxGTK = wxGTK28.override { + unicode = false; + }; }; skype_linux = import ../applications/networking/skype {