diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-19 11:16:24 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-19 11:16:24 +0000 |
| commit | 313a029f160e919a68e7c9705e631daf29d341b7 (patch) | |
| tree | 3291ae38e4ff296e14d1af6b935c443e31cf4469 /pkgs/applications/office | |
| parent | cdece697738e65c95183ae248fd4ef2e9ed4b439 (diff) | |
| parent | 668a5052142eab0b67a54160c9d299db78a2ce5d (diff) | |
| download | nixlib-313a029f160e919a68e7c9705e631daf29d341b7.tar nixlib-313a029f160e919a68e7c9705e631daf29d341b7.tar.gz nixlib-313a029f160e919a68e7c9705e631daf29d341b7.tar.bz2 nixlib-313a029f160e919a68e7c9705e631daf29d341b7.tar.lz nixlib-313a029f160e919a68e7c9705e631daf29d341b7.tar.xz nixlib-313a029f160e919a68e7c9705e631daf29d341b7.tar.zst nixlib-313a029f160e919a68e7c9705e631daf29d341b7.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/gnucash/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index a58c82e1b8b7..a2c3ed5d6bae 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -8,15 +8,12 @@ * for a possible solution. */ -let - name = "gnucash-2.4.8"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "gnucash-2.4.10"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "06gfgw4sq1b8c9qzinyd3wmcy3i0jyprngr259l0aldv8rvix8aa"; + sha256 = "1k76b6hnsmljggxsq5l9w94krfmhx58ij8jcxf72p0ddnlimdrjj"; }; buildInputs = [ @@ -44,7 +41,7 @@ stdenv.mkDerivation { ''; # The following settings fix failures in the test suite. It's not required otherwise. - NIX_LDFLAGS = "-rpath=${guile}/lib"; + NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib"; preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash"; doCheck = true; |