diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-17 10:15:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-17 10:15:03 +0100 |
| commit | 7cb4d92bec10e893574507d0b6afcd367ac74c05 (patch) | |
| tree | 557305f4ea1b8541b92bb4764ce740b6eef1800f /pkgs/tools/networking/p2p/amule | |
| parent | 90fc42c2f2bef844f5689b5939bcf760a23e4a63 (diff) | |
| download | nixpkgs-7cb4d92bec10e893574507d0b6afcd367ac74c05.tar nixpkgs-7cb4d92bec10e893574507d0b6afcd367ac74c05.tar.gz nixpkgs-7cb4d92bec10e893574507d0b6afcd367ac74c05.tar.bz2 nixpkgs-7cb4d92bec10e893574507d0b6afcd367ac74c05.tar.lz nixpkgs-7cb4d92bec10e893574507d0b6afcd367ac74c05.tar.xz nixpkgs-7cb4d92bec10e893574507d0b6afcd367ac74c05.tar.zst nixpkgs-7cb4d92bec10e893574507d0b6afcd367ac74c05.zip | |
amule: update and fix build on gcc47
Diffstat (limited to 'pkgs/tools/networking/p2p/amule')
| -rw-r--r-- | pkgs/tools/networking/p2p/amule/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/networking/p2p/amule/gcc47.patch | 21 |
2 files changed, 26 insertions, 3 deletions
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index eafa51fb4f2..3347ad010c7 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -12,17 +12,19 @@ let edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag; in mkDerivation rec { - name = "aMule-2.2.6"; + name = "aMule-2.3.1"; src = fetchurl { - url = "mirror://sourceforge/amule/${name}.tar.bz2"; - sha256 = "08l1931hcg1ia8yvhgx70hx64mknjnfn6l78m0ja44w13mgjpqvc"; + url = "mirror://sourceforge/amule/${name}.tar.xz"; + sha256 = "0hvpx3c005nvxsfand5bwfxxiq3mv0mpykajfm2lkygjh1rw2383"; }; buildInputs = [ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ] ++ lib.optional httpServer libpng; + patches = [ ./gcc47.patch ]; # from Gentoo + configureFlags = '' --with-crypto-prefix=${cryptopp} --disable-debug diff --git a/pkgs/tools/networking/p2p/amule/gcc47.patch b/pkgs/tools/networking/p2p/amule/gcc47.patch new file mode 100644 index 00000000000..e776dda3240 --- /dev/null +++ b/pkgs/tools/networking/p2p/amule/gcc47.patch @@ -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 ); + } + + \ No newline at end of file |