From d11c00e5a5ea121f218501931ccc9195c696bf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 2 Mar 2011 17:18:30 +0000 Subject: [PATCH] Adding xercesc, the references to coin3d and soqt, and trying to add freecad (that still does not build). svn path=/nixpkgs/trunk/; revision=26135 --- .../applications/graphics/freecad/default.nix | 45 +++++++++++++++++++ .../development/libraries/xercesc/default.nix | 17 +++++++ pkgs/top-level/all-packages.nix | 8 ++++ 3 files changed, 70 insertions(+) create mode 100644 pkgs/applications/graphics/freecad/default.nix create mode 100644 pkgs/development/libraries/xercesc/default.nix diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix new file mode 100644 index 000000000000..0dc942c202d4 --- /dev/null +++ b/pkgs/applications/graphics/freecad/default.nix @@ -0,0 +1,45 @@ +{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, +boost, zlib, +python, swig, gfortran, soqt, autoconf, automake, libtool }: + +throw "It does not build still" + +stdenv.mkDerivation rec { + name = "freecad-${version}"; + version = "0.11.3729"; + + src = fetchurl { +/* + url = "mirror://sourceforge/free-cad/freecad-${version}.tar.gz"; + sha256 = "0q9jhnhkjsq9iy4kqi4xh2ljack4b2jj4pjm4dylv4z2d9gg5p4l"; +*/ + url = "mirror://sourceforge/free-cad/freecad-${version}.dfsg.tar.gz"; + sha256 = "0sjcbadzzgdjr5bk51nr3nq0siyvfdq0913dqlhv9xr42vha3j8r"; + }; + + buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost + zlib python swig gfortran soqt /*autoconf automake libtool*/ ]; + +/* + # Using autotools + patchPhase = '' + sed -i -e 's/boost_\([a-z_]\+\)-mt/boost_\1/' \ + configure + ''; + + configureFlags = [ "--with-eigen2-include=${eigen}/include/eigen2" + "--with-boost-include=${boost}/include" + "--with-boost-lib=${boost}/lib" + "--with-qt4-dir=${qt4}" + ]; +*/ + + # Using cmake + + patchPhase = '' + sed -i -e '/Idf/d' -e '/Start/d' src/Mod/CMakeLists.txt + ''; + + cmakeFlags = [ "-Wno-dev" ]; + +} diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix new file mode 100644 index 000000000000..f5c9ba8a698b --- /dev/null +++ b/pkgs/development/libraries/xercesc/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "xerces-c-${version}"; + version = "3.1.1"; + + src = fetchurl { + url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz"; + sha256 = "0dl7jr26vlh5p3hps86xrwyafq6f21schc9q4zyxb48b3vvqa9x4"; + }; + + meta = { + homepage = http://xerces.apache.org/xerces-c/; + description = "Validating XML parser written in a portable subset of C++"; + license = "ASL2.0"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c580756a09e4..813a9475d118 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2875,6 +2875,8 @@ let inherit (gnome) gtk; }; + coin3d = callPackage ../development/libraries/coin3d { }; + commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; confuse = callPackage ../development/libraries/confuse { }; @@ -4091,6 +4093,8 @@ let # optional }; + soqt = callPackage ../development/libraries/soqt { }; + speechd = callPackage ../development/libraries/speechd { }; speex = callPackage ../development/libraries/speex { }; @@ -4214,6 +4218,8 @@ let xautolock = callPackage ../misc/screensavers/xautolock { }; + xercesc = callPackage ../development/libraries/xercesc {}; + xercesJava = callPackage ../development/libraries/java/xerces { ant = apacheAntGcj; # for bootstrap purposes javac = gcj; @@ -6021,6 +6027,8 @@ let flite = callPackage ../applications/misc/flite { }; + freecad = callPackage ../applications/graphics/freecad { }; + freemind = callPackage ../applications/misc/freemind { jdk = jdk; jre = jdk;