diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2008-09-04 20:24:03 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2008-09-04 20:24:03 +0000 |
| commit | a31f01e83bf61d28cda68d030bf334e027fb93ee (patch) | |
| tree | 1905ddd3c2ce5f197e593f8a612b61efdfbacafc /pkgs | |
| parent | 6f2086ec0e28c69ab2c48323b3c1da1f1ad5186d (diff) | |
| download | nixlib-a31f01e83bf61d28cda68d030bf334e027fb93ee.tar nixlib-a31f01e83bf61d28cda68d030bf334e027fb93ee.tar.gz nixlib-a31f01e83bf61d28cda68d030bf334e027fb93ee.tar.bz2 nixlib-a31f01e83bf61d28cda68d030bf334e027fb93ee.tar.lz nixlib-a31f01e83bf61d28cda68d030bf334e027fb93ee.tar.xz nixlib-a31f01e83bf61d28cda68d030bf334e027fb93ee.tar.zst nixlib-a31f01e83bf61d28cda68d030bf334e027fb93ee.zip | |
GNUnet: Wrap `gnunetd' so that it can dlopen the modules.
svn path=/nixpkgs/trunk/; revision=12801
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/p2p/gnunet/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 7867db761fbf..1abf982f9a3a 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt , zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig , libxml2, ncurses, gettext, findutils -, gtkSupport ? false, gtk ? null, libglade ? null }: +, gtkSupport ? false, gtk ? null, libglade ? null +, makeWrapper }: assert gtkSupport -> (gtk != null) && (libglade != null); @@ -23,6 +24,7 @@ in libextractor libmicrohttpd libgcrypt gmp curl libtool zlib guile adns sqlite libxml2 ncurses pkgconfig gettext findutils + makeWrapper ] ++ (if gtkSupport then [ gtk libglade ] else []); patches = [ @@ -49,6 +51,12 @@ in 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 = { description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4513ba0434b..8067199ebe41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6266,7 +6266,7 @@ let gnunet = import ../applications/networking/p2p/gnunet { inherit fetchurl stdenv libextractor libmicrohttpd libgcrypt gmp curl libtool guile adns sqlite gettext zlib pkgconfig - libxml2 ncurses findutils; + libxml2 ncurses findutils makeWrapper; inherit (gnome) gtk libglade; gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true; }; |