diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index d091af624463..c278cc989357 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -13,11 +13,11 @@ let edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag; in mkDerivation rec { - name = "aMule-2.3.1"; + name = "aMule-2.3.2"; src = fetchurl { url = "mirror://sourceforge/amule/${name}.tar.xz"; - sha256 = "0hvpx3c005nvxsfand5bwfxxiq3mv0mpykajfm2lkygjh1rw2383"; + sha256 = "0a1rd33hjl30qyzgb5y8m7dxs38asci3kjnlvims1ky6r3yj0izn"; }; buildInputs = @@ -25,7 +25,7 @@ mkDerivation rec { ++ lib.optional httpServer libpng ++ lib.optional client libX11; - patches = [ ./gcc47.patch ]; # from Gentoo + enableParallelBuilding = true; configureFlags = '' --with-crypto-prefix=${cryptopp} diff --git a/pkgs/tools/networking/p2p/amule/gcc47.patch b/pkgs/tools/networking/p2p/amule/gcc47.patch deleted file mode 100644 index e776dda3240e..000000000000 --- a/pkgs/tools/networking/p2p/amule/gcc47.patch +++ /dev/null @@ -1,21 +0,0 @@ -# http://code.google.com/p/amule/source/detail?r=10772 -diff -ur aMule-2.3.1.orig//src/ObservableQueue.h aMule-2.3.1/src/ObservableQueue.h ---- aMule-2.3.1.orig//src/ObservableQueue.h 2012-04-22 19:40:05.560084120 +0200 -+++ aMule-2.3.1/src/ObservableQueue.h 2012-04-22 19:40:32.479085322 +0200 -@@ -331,14 +331,14 @@ - template - void CObservableQueue::ObserverAdded( ObserverType* o ) - { -- NotifyObservers( EventType( EventType::STARTING ), o ); -+ this->NotifyObservers( EventType( EventType::STARTING ), o ); - } - - - template - void CObservableQueue::ObserverRemoved( ObserverType* o ) - { -- NotifyObservers( EventType( EventType::STOPPING ), o ); -+ this->NotifyObservers( EventType( EventType::STOPPING ), o ); - } - - \ No newline at end of file