Author: viric
Date: Wed Mar 2 17:18:30 2011
New Revision: 26135
URL: https://svn.nixos.org/websvn/nix/?rev=26135&sc=1
Log:
Adding xercesc, the references to coin3d and soqt, and trying to add
freecad (that still does not build).
Added:
nixpkgs/trunk/pkgs/applications/graphics/freecad/
nixpkgs/trunk/pkgs/applications/graphics/freecad/default.nix
nixpkgs/trunk/pkgs/development/libraries/xercesc/
nixpkgs/trunk/pkgs/development/libraries/xercesc/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/graphics/freecad/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/graphics/freecad/default.nix Wed Mar
2 17:18:30 2011 (r26135)
@@ -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" ];
+
+}
Added: nixpkgs/trunk/pkgs/development/libraries/xercesc/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/xercesc/default.nix Wed Mar
2 17:18:30 2011 (r26135)
@@ -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";
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Mar 2 17:18:24
2011 (r26134)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Mar 2 17:18:30
2011 (r26135)
@@ -2875,6 +2875,8 @@
inherit (gnome) gtk;
};
+ coin3d = callPackage ../development/libraries/coin3d { };
+
commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
confuse = callPackage ../development/libraries/confuse { };
@@ -4091,6 +4093,8 @@
# optional
};
+ soqt = callPackage ../development/libraries/soqt { };
+
speechd = callPackage ../development/libraries/speechd { };
speex = callPackage ../development/libraries/speex { };
@@ -4214,6 +4218,8 @@
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 @@
flite = callPackage ../applications/misc/flite { };
+ freecad = callPackage ../applications/graphics/freecad { };
+
freemind = callPackage ../applications/misc/freemind {
jdk = jdk;
jre = jdk;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
