From bcc93336cb6cab56ae758bdee3dff4b1691da893 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 27 Jul 2025 12:27:19 +0300 Subject: [PATCH] heroic: use steam.buildRuntimeEnv --- pkgs/by-name/he/heroic/package.nix | 148 +---------------------------- 1 file changed, 5 insertions(+), 143 deletions(-) diff --git a/pkgs/by-name/he/heroic/package.nix b/pkgs/by-name/he/heroic/package.nix index d9410e5d606f..77dc9a494db8 100644 --- a/pkgs/by-name/he/heroic/package.nix +++ b/pkgs/by-name/he/heroic/package.nix @@ -1,160 +1,22 @@ { - buildFHSEnv, + steam, heroic-unwrapped, extraPkgs ? pkgs: [ ], extraLibraries ? pkgs: [ ], }: -buildFHSEnv { +steam.buildRuntimeEnv { pname = "heroic"; - inherit (heroic-unwrapped) version; + inherit (heroic-unwrapped) version meta; runScript = "heroic"; - # Many Wine and native games need 32-bit libraries. - multiArch = true; - - # required by Electron - unshareIpc = false; - - targetPkgs = - pkgs: - with pkgs; - [ - heroic-unwrapped - gamemode - curl - gawk - zenity - kdePackages.kdialog - mangohud - net-tools - opencl-headers - p7zip - pciutils - perl - psmisc - python3 - umu-launcher - unzip - which - xorg.xrandr - zstd - ] - ++ extraPkgs pkgs; - - multiPkgs = - let - xorgDeps = - pkgs: with pkgs.xorg; [ - libICE - libpthreadstubs - libSM - libX11 - libXaw - libxcb - libXcomposite - libXcursor - libXdmcp - libXext - libXfixes - libXi - libXinerama - libXmu - libXrandr - libXrender - libXScrnSaver - libXt - libXtst - 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 - 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 - vulkan-loader - wayland - zlib - ] - ++ xorgDeps pkgs - ++ gstreamerDeps pkgs - ++ extraLibraries pkgs; + extraPkgs = pkgs: [ heroic-unwrapped ] ++ extraPkgs pkgs; + inherit extraLibraries; extraInstallCommands = '' mkdir -p $out/share ln -s ${heroic-unwrapped}/share/applications $out/share ln -s ${heroic-unwrapped}/share/icons $out/share ''; - - meta = heroic-unwrapped.meta; }