diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix deleted file mode 100644 index 1c0ad5aa361a..000000000000 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pnpm -, nodejs -, electron_31 -, makeWrapper -, copyDesktopItems -, makeDesktopItem -}: -stdenv.mkDerivation rec { - pname = "armcord"; - version = "3.3.1"; - - src = fetchFromGitHub { - owner = "ArmCord"; - repo = "ArmCord"; - rev = "v${version}"; - hash = "sha256-rCcjanmr4s9Nc5QB3Rb5ptKF/Ge8PSZt0WvgIul3RGs="; - }; - - nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; - - pnpmDeps = pnpm.fetchDeps { - inherit pname version src; - hash = "sha256-ZfErOj03NdkviNXV4bvZC8uPOk29RhgmSez/Qvw1sGo="; - }; - - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - - buildPhase = '' - runHook preBuild - - pnpm build - - npm exec electron-builder -- \ - --dir \ - -c.electronDist="${electron_31.dist}" \ - -c.electronVersion="${electron_31.version}" - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/share/lib/armcord" - cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/armcord" - - install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/armcord.png" - - makeShellWrapper "${lib.getExe electron_31}" "$out/bin/armcord" \ - --add-flags "$out/share/lib/armcord/resources/app.asar" \ - "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --set-default ELECTRON_IS_DEV 0 \ - --inherit-argv0 - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "armcord"; - desktopName = "ArmCord"; - exec = "armcord %U"; - icon = "armcord"; - comment = meta.description; - categories = [ "Network" ]; - startupWMClass = "ArmCord"; - terminal = false; - }) - ]; - - meta = with lib; { - description = "Lightweight, alternative desktop client for Discord"; - homepage = "https://armcord.app"; - downloadPage = "https://github.com/ArmCord/ArmCord"; - license = licenses.osl3; - maintainers = with maintainers; [ wrmilling water-sucks ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - mainProgram = "armcord"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d1d639ee3af9..7b09a3cd1638 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -127,6 +127,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fe85eaf0f77..cea2ba226198 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28259,9 +28259,6 @@ with pkgs; boost = boost175; }; - - armcord = callPackage ../applications/networking/instant-messengers/armcord { }; - autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { };