lutris: refactor, fix icons
* Split the package into wrapped and unwrapped versions; * Use FHS chrootenv for libraries instead of adding them to LD_LIBRARY_PATH; * Fix wrapping so that icons now work.
This commit is contained in:
Nikolay Amiantov
parent
c4b1ceb5a7
commit
b0a961e6fa
3 changed files with 183 additions and 167 deletions
116
pkgs/applications/misc/lutris/chrootenv.nix
Normal file
116
pkgs/applications/misc/lutris/chrootenv.nix
Normal file
|
|
@ -0,0 +1,116 @@
|
|||
{ buildFHSUserEnv, lutris-unwrapped
|
||||
, optimusSupport ? false
|
||||
, nvidiaSmiSupport ? false
|
||||
, steamSupport ? true
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
|
||||
gnome3Deps = pkgs: with pkgs.gnome3; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ];
|
||||
xorgDeps = pkgs: with pkgs.xorg; [
|
||||
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
|
||||
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
|
||||
xrandr
|
||||
];
|
||||
|
||||
lutris_ = lutris-unwrapped.override {
|
||||
inherit optimusSupport nvidiaSmiSupport steamSupport;
|
||||
};
|
||||
|
||||
in buildFHSUserEnv {
|
||||
name = "lutris";
|
||||
|
||||
runScript = "lutris";
|
||||
|
||||
targetPkgs = pkgs: with pkgs; [
|
||||
lutris_
|
||||
|
||||
# Common
|
||||
libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio
|
||||
libao libusb libevdev libudev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
|
||||
libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio
|
||||
libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib
|
||||
alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
|
||||
readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
|
||||
vulkan-loader xdg_utils sqlite
|
||||
|
||||
# Adventure Game Studio
|
||||
allegro dumb
|
||||
|
||||
# Desmume
|
||||
lua agg soundtouch openal desktop-file-utils pangox_compat atk
|
||||
|
||||
# DGen // TODO: libarchive is broken
|
||||
|
||||
# Dolphin
|
||||
bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
|
||||
wavpack gnutls-kdh orc nettle gmp pcre vulkan-loader
|
||||
|
||||
# DOSBox
|
||||
SDL_net SDL_sound
|
||||
|
||||
# GOG
|
||||
glib-networking
|
||||
|
||||
# Higan // TODO: "higan is not available for the x86_64 architecture"
|
||||
|
||||
# Libretro
|
||||
fluidsynth hidapi mesa libdrm
|
||||
|
||||
# MAME
|
||||
qt48 fontconfig SDL2_ttf
|
||||
|
||||
# Mednafen
|
||||
freeglut mesa_glu
|
||||
|
||||
# MESS
|
||||
expat
|
||||
|
||||
# Minecraft
|
||||
nss
|
||||
|
||||
# Mupen64Plus
|
||||
boost dash
|
||||
|
||||
# Osmose
|
||||
qt4
|
||||
|
||||
# PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
|
||||
|
||||
# PPSSPP
|
||||
glew snappy
|
||||
|
||||
# Redream // "redream is not available for the x86_64 architecture"
|
||||
|
||||
# ResidualVM
|
||||
flac
|
||||
|
||||
# rpcs3 // TODO: "error while loading shared libraries: libz.so.1..."
|
||||
llvm_4
|
||||
|
||||
# ScummVM
|
||||
nasm sndio
|
||||
|
||||
# Snes9x
|
||||
epoxy minizip
|
||||
|
||||
# Vice
|
||||
bison flex
|
||||
|
||||
# WINE
|
||||
perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC
|
||||
samba4 sane-backends openldap opencl-headers ocl-icd utillinux
|
||||
|
||||
# ZDOOM
|
||||
soundfont-fluid bzip2 game-music-emu
|
||||
] ++ qt5Deps pkgs
|
||||
++ gnome3Deps pkgs
|
||||
++ xorgDeps pkgs;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share
|
||||
ln -sf ${lutris_}/share/applications $out/share
|
||||
ln -sf ${lutris_}/share/icons $out/share
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,178 +1,70 @@
|
|||
{ stdenv, pkgs, buildFHSUserEnv, makeDesktopItem, fetchFromGitHub
|
||||
, wrapGAppsHook, python3Packages }:
|
||||
{ buildPythonApplication, lib, fetchFromGitHub
|
||||
, wrapGAppsHook, gobject-introspection, gnome-desktop, libnotify, libgnome-keyring, pango
|
||||
, gdk_pixbuf, atk, webkitgtk, gst_all_1
|
||||
, evdev, pyyaml, pygobject3, requests, pillow
|
||||
, xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma
|
||||
, libstrangle, wine, fluidsynth
|
||||
, optimusSupport ? false, primus, bumblebee
|
||||
, nvidiaSmiSupport ? false, nvidia_x11
|
||||
, steamSupport ? true, steam
|
||||
}:
|
||||
|
||||
let
|
||||
qt5Deps = with pkgs; with qt5; [ qtbase qtmultimedia ];
|
||||
gnome3Deps = with pkgs; with gnome3; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ];
|
||||
# See lutris/util/linux.py
|
||||
binPath = lib.makeBinPath ([
|
||||
xrandr
|
||||
pciutils
|
||||
psmisc
|
||||
glxinfo
|
||||
vulkan-tools
|
||||
xboxdrv
|
||||
pulseaudio
|
||||
p7zip
|
||||
xgamma
|
||||
libstrangle
|
||||
wine
|
||||
fluidsynth
|
||||
] ++ lib.optionals optimusSupport [ primus bumblebee ]
|
||||
++ lib.optional nvidiaSmiSupport nvidia_x11
|
||||
++ lib.optional steamSupport steam);
|
||||
|
||||
python3Deps = with pkgs; with python3Packages; [
|
||||
evdev pyyaml pyxdg pygobject3 pyqt5 dbus-python requests pillow
|
||||
];
|
||||
|
||||
xorgDeps = with pkgs; with xorg; [
|
||||
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
|
||||
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
|
||||
xrandr xdg_utils
|
||||
];
|
||||
|
||||
gstDeps = with pkgs; with gst_all_1; [
|
||||
gstDeps = with gst_all_1; [
|
||||
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
|
||||
gst-libav
|
||||
];
|
||||
|
||||
deps = with pkgs; [
|
||||
# Common
|
||||
stdenv.cc.cc libGL libGLU_combined libsndfile libtheora libogg libvorbis
|
||||
libopus libGLU libpcap libpulseaudio libao libusb libevdev libudev libgcrypt
|
||||
libxml2 libusb libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio
|
||||
libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2
|
||||
libxslt libtxc_dxtn libsndfile giflib zlib glib alsaLib zziplib bash dbus
|
||||
keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl
|
||||
graphite2 gtk2 gtk3 udev ncurses wayland libglvnd vulkan-loader
|
||||
in buildPythonApplication rec {
|
||||
name = "lutris-original-${version}";
|
||||
version = "0.5.2.1";
|
||||
|
||||
# Lutris
|
||||
gobject-introspection gdk_pixbuf hicolor-icon-theme pango openssl sqlite xterm libnotify procps
|
||||
|
||||
# Adventure Game Studio
|
||||
allegro dumb
|
||||
|
||||
# Desmume
|
||||
lua agg soundtouch openal desktop-file-utils pangox_compat atk
|
||||
|
||||
# DGen // TODO: libarchive is broken
|
||||
|
||||
# Dolphin
|
||||
bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
|
||||
wavpack gnutls-kdh orc nettle gmp pcre vulkan-loader
|
||||
|
||||
# DOSBox
|
||||
SDL_net SDL_sound
|
||||
|
||||
# GOG
|
||||
glib-networking
|
||||
|
||||
# Higan // TODO: "higan is not available for the x86_64 architecture"
|
||||
|
||||
# Libretro
|
||||
fluidsynth hidapi mesa libdrm
|
||||
|
||||
# MAME
|
||||
qt48 fontconfig SDL2_ttf
|
||||
|
||||
# Mednafen
|
||||
freeglut mesa_glu
|
||||
|
||||
# MESS
|
||||
expat
|
||||
|
||||
# Minecraft
|
||||
nss
|
||||
|
||||
# Mupen64Plus
|
||||
boost dash
|
||||
|
||||
# Osmose
|
||||
qt4
|
||||
|
||||
# PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
|
||||
|
||||
# PPSSPP
|
||||
glew snappy
|
||||
|
||||
# Redream // "redream is not available for the x86_64 architecture"
|
||||
|
||||
# ResidualVM
|
||||
flac
|
||||
|
||||
# rpcs3 // TODO: "error while loading shared libraries: libz.so.1..."
|
||||
llvm_4
|
||||
|
||||
# ScummVM
|
||||
nasm sndio
|
||||
|
||||
# Snes9x
|
||||
epoxy minizip
|
||||
|
||||
# Steam
|
||||
steam
|
||||
|
||||
# Vice
|
||||
bison flex
|
||||
|
||||
# WINE
|
||||
perl which p7zip gnused gnugrep psmisc cups lcms2 mpg123 cairo unixODBC
|
||||
samba4 sane-backends openldap opencl-headers ocl-icd utillinux
|
||||
|
||||
wineWowPackages.staging
|
||||
|
||||
# ZDOOM
|
||||
soundfont-fluid bzip2 game-music-emu
|
||||
] ++ qt5Deps
|
||||
++ gnome3Deps
|
||||
++ python3Deps
|
||||
++ xorgDeps
|
||||
++ gstDeps;
|
||||
|
||||
lutris = python3Packages.buildPythonApplication rec {
|
||||
name = "lutris-original-${version}";
|
||||
version = "0.5.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lutris";
|
||||
repo = "lutris";
|
||||
rev = "v${version}";
|
||||
sha256 = "023yqnzmnkfpq21r6ky6jzwbjxjcw1a5zqrrdl6fwwlr78fdhgpv";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
propagatedBuildInputs = deps;
|
||||
fullPath = stdenv.lib.makeLibraryPath deps;
|
||||
preConfigure = "export HOME=$PWD";
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib"
|
||||
"--set GI_TYPELIB_PATH $GI_TYPELIB_PATH"
|
||||
"--prefix XDG_DATA_DIRS : $out/share"
|
||||
"--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
ln -sf ${pkgs.gsm}/lib/libgsm.so $out/lib/libgsm.so.1
|
||||
mv $out/bin/lutris $out/bin/lutris-${version}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://lutris.net";
|
||||
description = "Open Source gaming platform for GNU/Linux";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ chiiruno ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "lutris";
|
||||
repo = "lutris";
|
||||
rev = "v${version}";
|
||||
sha256 = "023yqnzmnkfpq21r6ky6jzwbjxjcw1a5zqrrdl6fwwlr78fdhgpv";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Lutris";
|
||||
exec = "lutris";
|
||||
icon = "lutris";
|
||||
comment = lutris.meta.description;
|
||||
desktopName = "Lutris";
|
||||
genericName = "Gaming Platform";
|
||||
categories = "Network;Game;Emulator;";
|
||||
startupNotify = "false";
|
||||
buildInputs = [
|
||||
wrapGAppsHook gobject-introspection gnome-desktop libnotify libgnome-keyring pango
|
||||
gdk_pixbuf atk webkitgtk
|
||||
] ++ gstDeps;
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix PATH : ${binPath}"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
evdev pyyaml pygobject3 requests pillow
|
||||
];
|
||||
|
||||
preCheck = "export HOME=$PWD";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://lutris.net";
|
||||
description = "Open Source gaming platform for GNU/Linux";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ chiiruno ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
in buildFHSUserEnv rec {
|
||||
name = "lutris";
|
||||
|
||||
runScript = "lutris-${lutris.version}";
|
||||
targetPkgs = pkgs: [ lutris pkgs.glxinfo pkgs.pciutils ];
|
||||
passthru.lutris = lutris;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share
|
||||
cp -r ${desktopItem}/share/applications $out/share
|
||||
ln -sf ${lutris}/share/icons $out/share
|
||||
'';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19009,7 +19009,15 @@ in
|
|||
|
||||
luppp = callPackage ../applications/audio/luppp { };
|
||||
|
||||
lutris = callPackage ../applications/misc/lutris { };
|
||||
lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris {
|
||||
inherit (gnome3) gnome-desktop libgnome-keyring webkitgtk;
|
||||
nvidia_x11 = linuxPackages.nvidia_x11;
|
||||
wine = wineWowPackages.staging;
|
||||
};
|
||||
lutris = callPackage ../applications/misc/lutris/chrootenv.nix { };
|
||||
lutris-free = lutris.override {
|
||||
steamSupport = false;
|
||||
};
|
||||
|
||||
lv2bm = callPackage ../applications/audio/lv2bm { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue