Author: simons
Date: Mon Jul 11 16:38:07 2011
New Revision: 27729
URL: https://svn.nixos.org/websvn/nix/?rev=27729&sc=1
Log:
gnucash: fix update-gnucash-gconf script so that it works on NixOS
Current versions of gconftool-2 don't support the --config-source option
anymore -- that path must be passed in $GCONF_CONFIG_SOURCE instead.
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 Mon Jul 11
16:26:17 2011 (r27728)
+++ nixpkgs/trunk/pkgs/applications/office/gnucash/default.nix Mon Jul 11
16:38:07 2011 (r27729)
@@ -23,9 +23,7 @@
gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper
];
- 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";
+ configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi";
/* More flags to figure out:
--enable-gtkmm enable gtkmm gui
@@ -35,17 +33,26 @@
*/
postInstall = ''
+ sed -i $out/bin/update-gnucash-gconf \
+ -e 's|--config-source=[^ ]*
--install-schema-file|--makefile-install-rule|'
for prog in "$out/bin/"*
do
- wrapProgram "$prog" \
- --set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH" \
- --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH" \
- --prefix PATH ":" "${gconf}/bin"
+ wrapProgram "$prog" \
+ --set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH" \
+ --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH" \
+ --prefix LD_LIBRARY_PATH ":" "${libgnomeui}/lib/libglade/2.0" \
+ --prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0" \
+ --set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
+ --prefix PATH ":" "${gconf}/bin" \
+ --suffix PATH ":" "$out/bin"
done
'';
+ # The following settings fix failures in the test suite. It's not required
otherwise.
+ NIX_LDFLAGS = "-rpath=${guile}/lib";
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
