Unverified Commit 06a2910a authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #249454 from huantianad/webcord-440 

webcord: 4.3.0 -> 4.4.0
parents f18e0b18 c7a2d51c

pkgs/applications/networking/instant-messengers/webcord/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -6,23 +6,23 @@ 
, pipewire

, libpulseaudio

, xdg-utils

, electron_25

, electron_26

, makeDesktopItem

, nix-update-script

}:



buildNpmPackage rec {

  pname = "webcord";

  version = "4.3.0";

  version = "4.4.0";



  src = fetchFromGitHub {

    owner = "SpacingBat3";

    repo = "WebCord";

    rev = "v${version}";

    hash = "sha256-E/WXAVSCNTDEDaz71LXOHUf/APFO2uSpkTRhlZfQp0E=";

    hash = "sha256-Kiw3pebjH9Pz5oi6Gbjxrjd/kvozapLNqfWLVuTXF/I=";

  };



  npmDepsHash = "sha256-vGaYjM13seVmRbVPyDIM+qhGTCj6rw/el6Dq3KMzDks=";

  npmDepsHash = "sha256-CPGfhV8VXbpX9UB5oQhI+IwFWPgYq2dGnSuyByMNGg4=";



  nativeBuildInputs = [

    copyDesktopItems
@@ -56,7 +56,7 @@ buildNpmPackage rec { 
    install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png



    # Add xdg-utils to path via suffix, per PR #181171

    makeWrapper '${electron_25}/bin/electron' $out/bin/webcord \

    makeWrapper '${electron_26}/bin/electron' $out/bin/webcord \

      --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \

      --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
@@ -86,6 +86,6 @@ buildNpmPackage rec { 
    license = licenses.mit;

    mainProgram = "webcord";

    maintainers = with maintainers; [ huantian ];

    platforms = electron_25.meta.platforms;

    platforms = platforms.linux;

  };

}

pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix

+2 −7
Original line number Diff line number Diff line
@@ -2,10 +2,9 @@ 
, substituteAll

, lib

, vencord-web-extension

, electron_24

}:



(webcord.overrideAttrs (old: {

webcord.overrideAttrs (old: {

  patches = (old.patches or [ ]) ++ [

    (substituteAll {

      src = ./add-extension.patch;
@@ -17,8 +16,4 @@ 
    description = "Webcord with Vencord web extension";

    maintainers = with maintainers; [ FlafyDev NotAShelf ];

  };

})).override {

  # Webcord has updated to electron 25, but that causes a segfault

  # when launching webcord-vencord on wayland, so downgrade it for now.

  electron_25 = electron_24;

}
 
})