Author: simons
Date: Sun Jul 10 14:04:14 2011
New Revision: 27691
URL: https://svn.nixos.org/websvn/nix/?rev=27691&sc=1

Log:
gnucash: re-enable the test suite

Modified:
   nixpkgs/trunk/pkgs/applications/office/gnucash/default.nix

Modified: nixpkgs/trunk/pkgs/applications/office/gnucash/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/office/gnucash/default.nix  Sun Jul 10 
14:04:09 2011        (r27690)
+++ nixpkgs/trunk/pkgs/applications/office/gnucash/default.nix  Sun Jul 10 
14:04:14 2011        (r27691)
@@ -3,6 +3,9 @@
 , gettext, intltool, perl, guile, slibGuile, swig, isocodes, bzip2
 , makeWrapper }:
 
+# TODO: Fix the gconf issue. The following posting might be the missing clue:
+# <http://osdir.com/ml/linux.distributions.nixos/2007-09/msg00003.html>.
+
 let
   name = "gnucash-2.4.7";
 in
@@ -20,15 +23,7 @@
     gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper
   ];
 
-  /* The test suite isn't enabled at the moment, so this setting
-     shouldn't be necessary.
-
-  preConfigure = ''
-    # The `.gnucash' directory, used by the test suite.
-    export GNC_DOT_DIR="$PWD/dot-gnucash"
-    echo "\$GNC_DOT_DIR set to \`$GNC_DOT_DIR'"
-  '';
-   */
+  NIX_LDFLAGS = "-rpath=${libgnomeui}/lib/libglade/2.0 
-rpath=${libbonoboui}/lib/libglade/2.0 -rpath=${guile}/lib";
 
   configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O2 CXXFLAGS=-O2 --disable-dbi";
   /* More flags to figure out:
@@ -39,8 +34,6 @@
        --enable-python-bindings  enable python bindings
    */
 
-  NIX_LDFLAGS = "-rpath=${libgnomeui}/lib/libglade/2.0 
-rpath=${libbonoboui}/lib/libglade/2.0 -rpath=${guile}/lib";
-
   postInstall = ''
     for prog in "$out/bin/"*
     do
@@ -51,13 +44,8 @@
     done
   '';
 
-  doCheck = false;
-  /* The test suite fails as follows:
-
-       
/tmp/nix-build-y1mba6vkkscggnfigji57mwd0zhvnx1w-gnucash-2.4.7.drv-0/gnucash-2.4.7/src/import-export/test/.libs/lt-test-import-parse:
 error while loading shared libraries: libguile.so.17: cannot open shared 
object file: No such file or directory
-
-  */
-
+  preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
+  doCheck = true;
   enableParallelBuilding = true;
 
   meta = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to