public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amule: update and fix build on gcc47

Browse Source
This commit is contained in:
Vladimír Čunát 2013-03-17 10:15:03 +01:00
parent 90fc42c2f2
commit 7cb4d92bec
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/networking/p2p/amule/default.nix
View File

@ -12,17 +12,19 @@ let
edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag; edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
in in
mkDerivation rec { mkDerivation rec {
name = "aMule-2.2.6"; name = "aMule-2.3.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/amule/${name}.tar.bz2"; url = "mirror://sourceforge/amule/${name}.tar.xz";
sha256 = "08l1931hcg1ia8yvhgx70hx64mknjnfn6l78m0ja44w13mgjpqvc"; sha256 = "0hvpx3c005nvxsfand5bwfxxiq3mv0mpykajfm2lkygjh1rw2383";
}; };
buildInputs = buildInputs =
[ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ] [ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ]
++ lib.optional httpServer libpng; ++ lib.optional httpServer libpng;
patches = [ ./gcc47.patch ]; # from Gentoo
configureFlags = '' configureFlags = ''
--with-crypto-prefix=${cryptopp} --with-crypto-prefix=${cryptopp}
--disable-debug --disable-debug

21
pkgs/tools/networking/p2p/amule/gcc47.patch Normal file
View File

@ -0,0 +1,21 @@
# 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 <typename ValueType>
void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
{
- NotifyObservers( EventType( EventType::STARTING ), o );
+ this->NotifyObservers( EventType( EventType::STARTING ), o );
}
template <typename ValueType>
void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
{
- NotifyObservers( EventType( EventType::STOPPING ), o );
+ this->NotifyObservers( EventType( EventType::STOPPING ), o );
}