heroic: reformat to follow RFC style

This commit is contained in:
Aidan Gauland 2024-09-21 09:39:50 +12:00
parent 0ffc21b100
commit 7747aa9b17
No known key found for this signature in database
GPG Key ID: 16E68DD2D0E77C91
2 changed files with 143 additions and 130 deletions

View File

@ -1,16 +1,17 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, 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: {

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;