GNUnet: Wrap `gnunetd' so that it can dlopen the modules.

svn path=/nixpkgs/trunk/; revision=12801
This commit is contained in:
Ludovic Courtès 2008-09-04 20:24:03 +00:00
parent 6f2086ec0e
commit a31f01e83b
2 changed files with 10 additions and 2 deletions

View File

@ -1,7 +1,8 @@
{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt { stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig , zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig
, libxml2, ncurses, gettext, findutils , libxml2, ncurses, gettext, findutils
, gtkSupport ? false, gtk ? null, libglade ? null }: , gtkSupport ? false, gtk ? null, libglade ? null
, makeWrapper }:
assert gtkSupport -> (gtk != null) && (libglade != null); assert gtkSupport -> (gtk != null) && (libglade != null);
@ -23,6 +24,7 @@ in
libextractor libmicrohttpd libgcrypt gmp curl libtool libextractor libmicrohttpd libgcrypt gmp curl libtool
zlib guile adns sqlite libxml2 ncurses zlib guile adns sqlite libxml2 ncurses
pkgconfig gettext findutils pkgconfig gettext findutils
makeWrapper
] ++ (if gtkSupport then [ gtk libglade ] else []); ] ++ (if gtkSupport then [ gtk libglade ] else []);
patches = [ patches = [
@ -49,6 +51,12 @@ in
doCheck = false; doCheck = false;
# Help programs find the numerous modules that sit under `$out/lib/GNUnet'.
postInstall = ''
wrapProgram "$out/bin/gnunetd" \
--prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet"
'';
meta = { meta = {
description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";

View File

@ -6266,7 +6266,7 @@ let
gnunet = import ../applications/networking/p2p/gnunet { gnunet = import ../applications/networking/p2p/gnunet {
inherit fetchurl stdenv libextractor libmicrohttpd libgcrypt inherit fetchurl stdenv libextractor libmicrohttpd libgcrypt
gmp curl libtool guile adns sqlite gettext zlib pkgconfig gmp curl libtool guile adns sqlite gettext zlib pkgconfig
libxml2 ncurses findutils; libxml2 ncurses findutils makeWrapper;
inherit (gnome) gtk libglade; inherit (gnome) gtk libglade;
gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true; gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true;
}; };