Merge pull request #307836 from jopejoe1/openasar/split-out

openasar: unstable-2023-10-24 -> 0-unstable-2024-01-13, move out of discord, adpot, update script

2 files changed, 1 insertions, 53 deletions

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 15ff9c7a50557..920e02f6f47ab 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -69,14 +69,12 @@ let
     then ./linux.nix
     else ./darwin.nix;
 
-  openasar = callPackage ./openasar.nix { };
-
   packages = (
     builtins.mapAttrs
       (_: value:
         callPackage package (value
           // {
-          inherit src version openasar branch;
+          inherit src version branch;
           meta = meta // { mainProgram = value.binaryName; };
         }))
       {
diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix
deleted file mode 100644
index dbb05162f12a8..0000000000000
--- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, nodejs, bash, asar, unzip }:
-
-stdenv.mkDerivation rec {
-  pname = "openasar";
-  version = "unstable-2023-10-24";
-
-  src = fetchFromGitHub {
-    owner = "GooseMod";
-    repo = "OpenAsar";
-    rev = "eee9bab822e3dbd97a735d0050ddd41ba27917f2";
-    hash = "sha256-SSWQSqGgTZjowgrzF6qHZDTw/Y9xFHNTZvetxqZubYI=";
-  };
-
-  postPatch = ''
-    # Hardcode unzip path
-    substituteInPlace ./src/updater/moduleUpdater.js \
-      --replace \'unzip\' \'${unzip}/bin/unzip\'
-    # Remove auto-update feature
-    echo "module.exports = async () => log('AsarUpdate', 'Removed');" > ./src/asarUpdate.js
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-
-    bash scripts/injectPolyfills.sh
-    substituteInPlace src/index.js --replace 'nightly' '${version}'
-    ${nodejs}/bin/node scripts/strip.js
-    ${asar}/bin/asar pack src app.asar
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    install app.asar $out
-
-    runHook postInstall
-  '';
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Open-source alternative of Discord desktop's \"app.asar\".";
-    homepage = "https://openasar.dev";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
-    platforms = nodejs.meta.platforms;
-  };
-}