aMule: Use `libupnp'.

svn path=/nixpkgs/trunk/; revision=12996

pkgs/tools/networking/p2p/amule/default.nix

@@ -1,4 +1,5 @@
-{ fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, gettext }:
+{ fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext
+, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "aMule-2.2.1";
@@ -8,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0zcsyy6bm7ls1dpmfm0yskd2gj50ah2bvkm0v42826zwzj6sbxy9";
   };
 
-  buildInputs = [ zlib wxGTK perl cryptopp gettext ];
+  buildInputs = [ zlib wxGTK perl cryptopp libupnp gettext makeWrapper ];
 
   configureFlags = "--with-crypto-prefix=${cryptopp}";
 
@@ -17,6 +18,13 @@ stdenv.mkDerivation rec {
         -es'|/usr/bin/perl|${perl}/bin/perl|g'
   '';
 
+  # aMule will try to `dlopen' libupnp and libixml, so help it
+  # find them.
+  postInstall = ''
+    wrapProgram "$out/bin/amule" \
+      --prefix LD_LIBRARY_PATH ":" "${libupnp}/lib"
+  '';
+
   meta = {
     homepage = http://amule.org/;
     description = "aMule, a peer-to-peer client for the eD2K and Kademlia networks";

pkgs/top-level/all-packages.nix

@@ -469,7 +469,7 @@ let
   };
 
   amule = import ../tools/networking/p2p/amule {
-    inherit fetchurl stdenv zlib perl cryptopp gettext;
+    inherit fetchurl stdenv zlib perl cryptopp gettext libupnp makeWrapper;
     wxGTK = wxGTK28;
   };