diff options
author | Artturi <Artturin@artturin.com> | 2022-02-21 23:26:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-21 23:26:44 +0200 |
commit | e78f0899975fea7bfa7863844ebd247d33faa395 (patch) | |
tree | cb5e61c450635263face28f6ea557d5a17368a31 | |
parent | 05bb35fdb61ed4232aeee334ca5f510429fc59d3 (diff) | |
parent | 81ef57d6949b8a7b80a7e7ccf792df0be7df0e84 (diff) | |
download | nixlib-e78f0899975fea7bfa7863844ebd247d33faa395.tar nixlib-e78f0899975fea7bfa7863844ebd247d33faa395.tar.gz nixlib-e78f0899975fea7bfa7863844ebd247d33faa395.tar.bz2 nixlib-e78f0899975fea7bfa7863844ebd247d33faa395.tar.lz nixlib-e78f0899975fea7bfa7863844ebd247d33faa395.tar.xz nixlib-e78f0899975fea7bfa7863844ebd247d33faa395.tar.zst nixlib-e78f0899975fea7bfa7863844ebd247d33faa395.zip |
Merge pull request #161257 from Stunkymonkey/amule-appendToName
-rw-r--r-- | pkgs/tools/networking/p2p/amule/default.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index c2e5f4568242..fc389f2c4dc4 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -20,8 +20,13 @@ , libX11 }: +# daemon and client are not build monolithic +assert monolithic || (!monolithic && (enableDaemon || client)); + stdenv.mkDerivation rec { - pname = "amule"; + pname = "amule" + + lib.optionalString enableDaemon "-daemon" + + lib.optionalString client "-gui"; version = "2.3.3"; src = fetchFromGitHub { @@ -34,9 +39,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ]; buildInputs = [ - zlib wxGTK30-gtk3 perl cryptopp.dev libupnp boost + zlib + wxGTK30-gtk3 + perl + cryptopp.dev + libupnp + boost ] ++ lib.optional httpServer libpng - ++ lib.optional client libX11; + ++ lib.optional client libX11; cmakeFlags = [ "-DBUILD_MONOLITHIC=${if monolithic then "ON" else "OFF"}" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5c077de50d23..af9e8c60fdda 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -63,6 +63,8 @@ mapAliases ({ amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # Added 2020-10-30 aminal = throw "aminal was renamed to darktile."; # Added 2021-09-28 ammonite-repl = ammonite; # Added 2017-05-02 + amuleDaemon = throw "amuleDaemon was renamed to amule-daemon."; # Added 2022-02-11 + amuleGui = throw "amuleGui was renamed to amule-gui."; # Added 2022-02-11 amsn = throw "amsn has been removed due to being unmaintained."; # Added 2020-12-09 angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06 antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # Added 2020-08-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ebeab8710b7..8210be2a5efd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1534,15 +1534,15 @@ with pkgs; amule = callPackage ../tools/networking/p2p/amule { }; - amuleDaemon = appendToName "daemon" (amule.override { + amule-daemon = amule.override { monolithic = false; enableDaemon = true; - }); + }; - amuleGui = appendToName "gui" (amule.override { + amule-gui = amule.override { monolithic = false; client = true; - }); + }; antennas = nodePackages.antennas; |