amuleGui,amuleDaemon: remove appendToName to have a consistent package name for repology

This commit is contained in:
Felix Buehler 2022-02-21 19:01:54 +01:00
parent 71ecd7e168
commit 9a5767cd5c
2 changed files with 17 additions and 7 deletions

View file

@ -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"}"

View file

@ -1530,15 +1530,15 @@ with pkgs;
amule = callPackage ../tools/networking/p2p/amule { };
amuleDaemon = appendToName "daemon" (amule.override {
amuleDaemon = amule.override {
monolithic = false;
enableDaemon = true;
});
};
amuleGui = appendToName "gui" (amule.override {
amuleGui = amule.override {
monolithic = false;
client = true;
});
};
antennas = nodePackages.antennas;