heroic: 2.15.1 -> 2.15.2 (#343364)

This commit is contained in:
K900 2024-09-25 09:40:53 +03:00 committed by GitHub
commit 5820b7618c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 150 additions and 131 deletions

View File

@ -1,26 +1,28 @@
{ lib
, stdenv
, fetchFromGitHub
, pnpm
, nodejs
, makeWrapper
, electron
, vulkan-helper
, gogdl
, legendary-gl
, nile
, comet-gog
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
pnpm,
nodejs,
makeWrapper,
electron,
vulkan-helper,
gogdl,
legendary-gl,
nile,
comet-gog,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "heroic-unwrapped";
version = "2.15.1";
version = "2.15.2";
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "HeroicGamesLauncher";
rev = "v${finalAttrs.version}";
hash = "sha256-+OQRcBOf9Y34DD7FOp/3SO05mREG6or/HPiOkasHWPM=";
hash = "sha256-AndJqk1VAUdC4pOTRzyfhdxmzJMskGF6pUiqPs3fIy4=";
};
pnpmDeps = pnpm.fetchDeps {
@ -93,6 +95,11 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
passthru = {
inherit (finalAttrs) pnpmDeps;
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac";
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";

View File

@ -1,7 +1,8 @@
{ buildFHSEnv
, heroic-unwrapped
, extraPkgs ? pkgs: [ ]
, extraLibraries ? pkgs: [ ]
{
buildFHSEnv,
heroic-unwrapped,
extraPkgs ? pkgs: [ ],
extraLibraries ? pkgs: [ ],
}:
buildFHSEnv {
@ -15,120 +16,131 @@ buildFHSEnv {
# required by Electron
unshareIpc = false;
targetPkgs = pkgs: with pkgs; [
heroic-unwrapped
gamemode
curl
gawk
zenity
plasma5Packages.kdialog
mangohud
nettools
opencl-headers
p7zip
perl
psmisc
python3
unzip
which
xorg.xrandr
zstd
] ++ extraPkgs pkgs;
targetPkgs =
pkgs:
with pkgs;
[
heroic-unwrapped
gamemode
curl
gawk
zenity
plasma5Packages.kdialog
mangohud
nettools
opencl-headers
p7zip
perl
psmisc
python3
unzip
which
xorg.xrandr
zstd
]
++ extraPkgs pkgs;
multiPkgs = let
xorgDeps = pkgs: with pkgs.xorg; [
libpthreadstubs
libSM
libX11
libXaw
libxcb
libXcomposite
libXcursor
libXdmcp
libXext
libXi
libXinerama
libXmu
libXrandr
libXrender
libXv
libXxf86vm
];
gstreamerDeps = pkgs: with pkgs.gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gst-plugins-bad
gst-libav
];
in pkgs: with pkgs; [
alsa-lib
alsa-plugins
bash
cabextract
cairo
coreutils
cups
dbus
freealut
freetype
fribidi
giflib
glib
gnutls
gtk3
icu
lcms2
libevdev
libgcrypt
libGLU
libglvnd
libgpg-error
libgudev
libjpeg
libkrb5
libmpeg2
libogg
libopus
libpng
libpulseaudio
libselinux
libsndfile
libsoup
libtheora
libtiff
libunwind
libusb1
libv4l
libva
libvdpau
libvorbis
libvpx
libwebp
libxkbcommon
libxml2
mpg123
ncurses
ocl-icd
openal
openldap
openssl
pango
pipewire
samba4
sane-backends
SDL2
speex
sqlite
udev
unixODBC
util-linux
v4l-utils
vulkan-loader
wayland
zlib
] ++ xorgDeps pkgs
multiPkgs =
let
xorgDeps =
pkgs: with pkgs.xorg; [
libpthreadstubs
libSM
libX11
libXaw
libxcb
libXcomposite
libXcursor
libXdmcp
libXext
libXi
libXinerama
libXmu
libXrandr
libXrender
libXv
libXxf86vm
];
gstreamerDeps =
pkgs: with pkgs.gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-ugly
gst-plugins-bad
gst-libav
];
in
pkgs:
with pkgs;
[
alsa-lib
alsa-plugins
bash
cabextract
cairo
coreutils
cups
dbus
freealut
freetype
fribidi
giflib
glib
gnutls
gtk3
icu
lcms2
libevdev
libgcrypt
libGLU
libglvnd
libgpg-error
libgudev
libjpeg
libkrb5
libmpeg2
libogg
libopus
libpng
libpulseaudio
libselinux
libsndfile
libsoup
libtheora
libtiff
libunwind
libusb1
libv4l
libva
libvdpau
libvorbis
libvpx
libwebp
libxkbcommon
libxml2
mpg123
ncurses
ocl-icd
openal
openldap
openssl
pango
pipewire
samba4
sane-backends
SDL2
speex
sqlite
udev
unixODBC
util-linux
v4l-utils
vulkan-loader
wayland
zlib
]
++ xorgDeps pkgs
++ gstreamerDeps pkgs
++ extraLibraries pkgs;