From c936e89fc1d0d24603f03917d73fd010e166317a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Mar 2010 08:20:29 +0000 Subject: [PATCH] aMule 2.2.6. svn path=/nixpkgs/trunk/; revision=20866 --- pkgs/tools/networking/p2p/amule/default.nix | 14 +++++++++----- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 886194a557f..68bf5baa333 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -1,15 +1,16 @@ { fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext -, makeWrapper }: +, pkgconfig, makeWrapper }: stdenv.mkDerivation rec { - name = "aMule-2.2.2"; + name = "aMule-2.2.6"; src = fetchurl { url = "mirror://sourceforge/amule/${name}.tar.bz2"; - sha256 = "0yrp3vk1gqfajgldfs4an5rd1l4i69icsrzcqmfxsny6qbcrv5hv"; + sha256 = "08l1931hcg1ia8yvhgx70hx64mknjnfn6l78m0ja44w13mgjpqvc"; }; - buildInputs = [ zlib wxGTK perl cryptopp libupnp gettext makeWrapper ]; + buildInputs = + [ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ]; configureFlags = "--with-crypto-prefix=${cryptopp}"; @@ -40,6 +41,9 @@ stdenv.mkDerivation rec { applications. ''; - license = "GPLv2+"; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2230cc3024c..c459fc1bc74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -363,8 +363,8 @@ let }; amule = import ../tools/networking/p2p/amule { - inherit fetchurl stdenv zlib perl cryptopp gettext libupnp makeWrapper; - inherit wxGTK; + inherit fetchurl stdenv zlib perl cryptopp gettext libupnp makeWrapper + wxGTK pkgconfig; }; aria = builderDefsPackage (import ../tools/networking/aria) {