diff options
author | Felix Buehler <account@buehler.rocks> | 2022-02-21 19:01:54 +0100 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2022-02-21 19:07:47 +0100 |
commit | 9a5767cd5c147afab072d369e7ac3a73eadb79bf (patch) | |
tree | e187dfda74fa6cb738169619e4b4264510761b26 | |
parent | 71ecd7e1688f67a1970e8ee9fded31c2ece429d2 (diff) | |
download | nixlib-9a5767cd5c147afab072d369e7ac3a73eadb79bf.tar nixlib-9a5767cd5c147afab072d369e7ac3a73eadb79bf.tar.gz nixlib-9a5767cd5c147afab072d369e7ac3a73eadb79bf.tar.bz2 nixlib-9a5767cd5c147afab072d369e7ac3a73eadb79bf.tar.lz nixlib-9a5767cd5c147afab072d369e7ac3a73eadb79bf.tar.xz nixlib-9a5767cd5c147afab072d369e7ac3a73eadb79bf.tar.zst nixlib-9a5767cd5c147afab072d369e7ac3a73eadb79bf.zip |
amuleGui,amuleDaemon: remove appendToName to have a consistent package name for repology
-rw-r--r-- | pkgs/tools/networking/p2p/amule/default.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 17 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/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bcf252e06c9..fb1cc2b3de0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |