diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2017-03-18 09:36:08 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2017-03-18 09:36:08 +0100 |
| commit | f77ae4e72607a658bdfd117b7e6f32aa4504befc (patch) | |
| tree | 03480de790868a40b0173aaf7c83d3427dc830f1 /pkgs/tools/networking/p2p/amule | |
| parent | b0ba94310d7a45babc16d2c676fb5c45e789d499 (diff) | |
| download | nixpkgs-f77ae4e72607a658bdfd117b7e6f32aa4504befc.tar nixpkgs-f77ae4e72607a658bdfd117b7e6f32aa4504befc.tar.gz nixpkgs-f77ae4e72607a658bdfd117b7e6f32aa4504befc.tar.bz2 nixpkgs-f77ae4e72607a658bdfd117b7e6f32aa4504befc.tar.lz nixpkgs-f77ae4e72607a658bdfd117b7e6f32aa4504befc.tar.xz nixpkgs-f77ae4e72607a658bdfd117b7e6f32aa4504befc.tar.zst nixpkgs-f77ae4e72607a658bdfd117b7e6f32aa4504befc.zip | |
amule: 2.3.1 -> 2.3.2
Diffstat (limited to 'pkgs/tools/networking/p2p/amule')
| -rw-r--r-- | pkgs/tools/networking/p2p/amule/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/p2p/amule/gcc47.patch | 21 |
2 files changed, 3 insertions, 24 deletions
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index d091af62446..c278cc98935 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 e776dda3240..00000000000 --- 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 <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 |