From f88d1cd0513a9cc7d55cef9c5186da83a8afaf05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 7 Oct 2008 21:50:24 +0000 Subject: [PATCH] aMule: Use `libupnp'. svn path=/nixpkgs/trunk/; revision=12996 --- pkgs/tools/networking/p2p/amule/default.nix | 12 ++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 38aa9474f79..73675e0b18e 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0ca9901a38..12d84e31184 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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; };