155 current 2024-05-29 15:28:39 24.11.20240524.bfb7a88 6.9.1-zen1 *

This commit is contained in:
sadan 2024-05-29 15:28:48 -04:00
parent c4bf2df314
commit 28ec440896
No known key found for this signature in database
5 changed files with 38 additions and 102 deletions

View file

@ -1,67 +1,17 @@
{ pname
, version
, src
, meta
, binaryName
, desktopName
, autoPatchelfHook
, makeDesktopItem
, lib
, stdenv
, wrapGAppsHook
, makeShellWrapper
, alsa-lib
, at-spi2-atk
, at-spi2-core
, atk
, cairo
, cups
, dbus
, expat
, fontconfig
, freetype
, gdk-pixbuf
, glib
, gtk3
, libcxx
, libdrm
, libglvnd
, libnotify
, libpulseaudio
, libuuid
, libX11
, libXScrnSaver
, libXcomposite
, libXcursor
, libXdamage
, libXext
, libXfixes
, libXi
, libXrandr
, libXrender
, libXtst
, libxcb
, libxshmfence
, mesa
, nspr
, nss
, pango
, systemd
, libappindicator-gtk3
, libdbusmenu
, writeScript
, python3
, runCommand
{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook
, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk
, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf
, glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
, libunity
, speechd
, wayland
, branch
, withOpenASAR ? false
, openasar
, withVencord ? true
, vencord
, withTTS ? true
}:
, withOpenASAR ? false, openasar
, withVencord ? true, vencord
, withTTS ? true }:
let
disableBreakingUpdates = runCommand "disable-breaking-updates.py"
@ -172,30 +122,17 @@ stdenv.mkDerivation rec {
ln -s "$desktopItem/share/applications" $out/share/
set -x
set -e
cp "${./installer}" $out/opt/vencordInstaller
chmod 770 $out/opt/vencordInstaller
patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
$out/opt/vencordInstaller
VENCORD_USER_DATA_DIR="/home/meyer/.config/Vencord/dist" $out/opt/vencordInstaller -location $out/opt/Discord -install
runHook postInstall
'';
postInstall =
''
# set -x
# set -e
#
# cp "${./installer}" $out/bin/vencordInstaller
#
# chmod +x $out/bin/vencordInstaller
# patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
# $out/bin/vencordInstaller
# $out/bin/vencordInstaller -location $out/opt/Discord -install
'';
postInstall = lib.strings.optionalString withOpenASAR ''
cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar
'' + lib.strings.optionalString withVencord ''
mv $out/opt/${binaryName}/resources/app.asar $out/opt/${binaryName}/resources/_app.asar
mkdir $out/opt/${binaryName}/resources/app.asar
echo '{"name":"discord","main":"index.js"}' > $out/opt/${binaryName}/resources/app.asar/package.json
echo 'require("${vencord}/patcher.js")' > $out/opt/${binaryName}/resources/app.asar/index.js
'';
desktopItem = makeDesktopItem {
name = pname;