Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.05] legcord: init at 1.0.1, armcord: remove, add throw with migration details #347988

Open
wants to merge 2 commits into
base: release-24.05
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@
}:

stdenv.mkDerivation rec {
pname = "armcord";
version = "3.3.1";
pname = "legcord";
version = "1.0.1";

src =
let
base = "https://github.com/ArmCord/ArmCord/releases/download";
base = "https://github.com/Legcord/Legcord/releases/download";
in
{
x86_64-linux = fetchurl {
url = "${base}/v${version}/ArmCord-${version}-linux-amd64.deb";
hash = "sha256-BFhgZNBHPERvJY9N4NpnlkGo2M0keencU4H4qlXl9mk=";
url = "${base}/v${version}/Legcord-${version}-linux-amd64.deb";
hash = "sha256-kZ9dhSJjhYmpZJLbWP8nPP6Lxw+wLe3d9cCahfIomNM=";
};
aarch64-linux = fetchurl {
url = "${base}/v${version}/ArmCord-${version}-linux-arm64.deb";
hash = "sha256-PCODruXQW7iAZLKcNw672fs4OuCqDvMlvzRSNca8Tfo=";
url = "${base}/v${version}/Legcord-${version}-linux-arm64.deb";
hash = "sha256-Ikyjmlt1F7f6WaYWuAgyzLP3zvQPCvMRZ1D9e79umgM=";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

Expand Down Expand Up @@ -114,28 +114,28 @@ stdenv.mkDerivation rec {
chmod -R g-w "$out"

# Wrap the startup command
makeBinaryWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
makeBinaryWrapper $out/opt/Legcord/legcord $out/bin/legcord \
"''${gappsWrapperArgs[@]}" \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer }}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}

# Fix desktop link
substituteInPlace $out/share/applications/armcord.desktop \
--replace /opt/ArmCord/ $out/bin/
substituteInPlace $out/share/applications/legcord.desktop \
--replace /opt/Legcord/ $out/bin/

runHook postInstall
'';

meta = with lib; {
description = "Lightweight, alternative desktop client for Discord";
homepage = "https://armcord.app";
downloadPage = "https://github.com/ArmCord/ArmCord";
homepage = "https://legcord.app";
downloadPage = "https://github.com/Legcord/Legcord";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.osl3;
maintainers = with maintainers; [ wrmilling ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
mainProgram = "armcord";
mainProgram = "legcord";
};
}
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ mapAliases ({
archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03
ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13
aria = aria2; # Added 2024-03-26
armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11
aseprite-unfree = aseprite; # Added 2023-08-26
asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16
asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19
Expand Down
3 changes: 0 additions & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29720,9 +29720,6 @@ with pkgs;
boost = boost175;
};


armcord = callPackage ../applications/networking/instant-messengers/armcord { };

aumix = callPackage ../applications/audio/aumix {
gtkGUI = false;
};
Expand Down
Loading