diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-03-18 10:57:37 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-03-18 11:00:31 +0100 |
commit | 742b120ddc77bfbd1fc489cdd743974a80699eda (patch) | |
tree | 9cfd7886f7304b7044ba998b8a3031011a7ed86a /pkgs/tools/networking/p2p/amule | |
parent | 7ff6eec5fd80ece0d634f1353c96f6ba4fb11ec6 (diff) | |
parent | 553964ca7120c6341a58f84c60f6e6eaa2c43bb3 (diff) | |
download | nixpkgs-742b120ddc77bfbd1fc489cdd743974a80699eda.tar nixpkgs-742b120ddc77bfbd1fc489cdd743974a80699eda.tar.gz nixpkgs-742b120ddc77bfbd1fc489cdd743974a80699eda.tar.bz2 nixpkgs-742b120ddc77bfbd1fc489cdd743974a80699eda.tar.lz nixpkgs-742b120ddc77bfbd1fc489cdd743974a80699eda.tar.xz nixpkgs-742b120ddc77bfbd1fc489cdd743974a80699eda.tar.zst nixpkgs-742b120ddc77bfbd1fc489cdd743974a80699eda.zip |
Merge branch 'master' into staging
Nontrivial rebuilds from master, again :-/
Diffstat (limited to 'pkgs/tools/networking/p2p/amule')
-rw-r--r-- | pkgs/tools/networking/p2p/amule/default.nix | 6 |
1 files changed, 3 insertions, 3 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} |