Author: simons
Date: Sun Jul 10 13:34:56 2011
New Revision: 27689
URL: https://svn.nixos.org/websvn/nix/?rev=27689&sc=1
Log:
gnucash: set RPATH so that GnuCash binaries can find its GNOME libraries at
run-time
Modified:
nixpkgs/trunk/pkgs/applications/office/gnucash/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/office/gnucash/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/office/gnucash/default.nix Sun Jul 10
13:34:51 2011 (r27688)
+++ nixpkgs/trunk/pkgs/applications/office/gnucash/default.nix Sun Jul 10
13:34:56 2011 (r27689)
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk
-, libglade, libgnomeui, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant
+, libbonoboui, libgnomeui, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant
, gettext, intltool, perl, guile, slibGuile, swig, isocodes, bzip2
, makeWrapper }:
@@ -16,7 +16,7 @@
buildInputs = [
pkgconfig libxml2 gconf glib gtk
- libglade libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant
+ libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant
gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper
];
@@ -39,6 +39,8 @@
--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
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jul 10 13:34:51
2011 (r27688)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Jul 10 13:34:56
2011 (r27689)
@@ -6317,8 +6317,8 @@
};
gnucash = callPackage ../applications/office/gnucash {
- inherit (gnome) gtk glib libglade libgnomeui libgtkhtml gtkhtml
- libgnomeprint;
+ inherit (gnome) gtk glib libgnomeui libgtkhtml gtkhtml
+ libbonoboui libgnomeprint;
gconf = gnome.GConf;
guile = guile_1_8;
slibGuile = slibGuile.override { scheme = guile_1_8; };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
