diff options
| author | Peter Simons <simons@cryp.to> | 2011-07-11 16:38:07 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-07-11 16:38:07 +0000 |
| commit | 2685bfc32bdc0908172d5790d5d49eed2878fa5a (patch) | |
| tree | e4bcba03351dc0f8f323dd5a91378b91c1a95d0f /pkgs/applications/office | |
| parent | 69dca5f4aa35fd2b32b49372f0400fbc570c9e16 (diff) | |
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. svn path=/nixpkgs/trunk/; revision=27729
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/gnucash/default.nix | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index e2cbd3e2d6f7b..2234f07b0abed 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation { 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 @@ stdenv.mkDerivation { */ 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 = { |