pyrox.dev
lol
amule: update and fix build on gcc47
+5
-3
pkgs/tools/networking/p2p/amule/default.nix
+5
-3
pkgs/tools/networking/p2p/amule/default.nix
···
12
12
edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
13
13
in
14
14
mkDerivation rec {
15
-
name = "aMule-2.2.6";
15
+
name = "aMule-2.3.1";
16
16
17
17
src = fetchurl {
18
-
url = "mirror://sourceforge/amule/${name}.tar.bz2";
19
-
sha256 = "08l1931hcg1ia8yvhgx70hx64mknjnfn6l78m0ja44w13mgjpqvc";
18
+
url = "mirror://sourceforge/amule/${name}.tar.xz";
19
+
sha256 = "0hvpx3c005nvxsfand5bwfxxiq3mv0mpykajfm2lkygjh1rw2383";
20
20
};
21
21
22
22
buildInputs =
23
23
[ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ]
24
24
++ lib.optional httpServer libpng;
25
+
26
+
patches = [ ./gcc47.patch ]; # from Gentoo
25
27
26
28
configureFlags = ''
27
29
--with-crypto-prefix=${cryptopp}
+21
pkgs/tools/networking/p2p/amule/gcc47.patch
+21
pkgs/tools/networking/p2p/amule/gcc47.patch
···
1
+
# http://code.google.com/p/amule/source/detail?r=10772
2
+
diff -ur aMule-2.3.1.orig//src/ObservableQueue.h aMule-2.3.1/src/ObservableQueue.h
3
+
--- aMule-2.3.1.orig//src/ObservableQueue.h 2012-04-22 19:40:05.560084120 +0200
4
+
+++ aMule-2.3.1/src/ObservableQueue.h 2012-04-22 19:40:32.479085322 +0200
5
+
@@ -331,14 +331,14 @@
6
+
template <typename ValueType>
7
+
void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
8
+
{
9
+
- NotifyObservers( EventType( EventType::STARTING ), o );
10
+
+ this->NotifyObservers( EventType( EventType::STARTING ), o );
11
+
}
12
+
13
+
14
+
template <typename ValueType>
15
+
void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
16
+
{
17
+
- NotifyObservers( EventType( EventType::STOPPING ), o );
18
+
+ this->NotifyObservers( EventType( EventType::STOPPING ), o );
19
+
}
20
+
21
+