summary refs log tree commit diff
path: root/pkgs/applications/misc/lutris
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/misc/lutris')
-rw-r--r--pkgs/applications/misc/lutris/default.nix12
-rw-r--r--pkgs/applications/misc/lutris/fhsenv.nix (renamed from pkgs/applications/misc/lutris/chrootenv.nix)2
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index fccb6ef49a9..b3a68cffeff 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -8,7 +8,6 @@
 , gobject-introspection
 , gst_all_1
 , gtk3
-, libgnome-keyring
 , libnotify
 , pango
 , webkitgtk
@@ -22,6 +21,7 @@
 , pygobject3
 , pyyaml
 , requests
+, keyring
 
 # commands that lutris needs
 , xrandr
@@ -37,6 +37,7 @@
 , wine
 , fluidsynth
 , xorgserver
+, xorg
 }:
 
 let
@@ -55,6 +56,8 @@ let
     wine
     fluidsynth
     xorgserver
+    xorg.setxkbmap
+    xorg.xkbcomp
   ];
 
   gstDeps = with gst_all_1; [
@@ -68,13 +71,13 @@ let
 
 in buildPythonApplication rec {
   pname = "lutris-original";
-  version = "0.5.6";
+  version = "0.5.7.1";
 
   src = fetchFromGitHub {
     owner = "lutris";
     repo = "lutris";
     rev = "v${version}";
-    sha256 = "1f78qhyy8xqdg0rhxcwkap1bmg5mfxhb8qw1vbpxr6g62ajpwksa";
+    sha256 = "12ispwkbbm5aq263n3bdjmjfkpwplizacnqs2c0wnag4zj4kpm29";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];
@@ -85,14 +88,13 @@ in buildPythonApplication rec {
     gnome-desktop
     gobject-introspection
     gtk3
-    libgnome-keyring
     libnotify
     pango
     webkitgtk
   ] ++ gstDeps;
 
   propagatedBuildInputs = [
-    evdev distro pyyaml pygobject3 requests pillow dbus-python
+    evdev distro pyyaml pygobject3 requests pillow dbus-python keyring
   ];
 
   # avoid double wrapping
diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
index 6fad8b23d33..2b656775ab5 100644
--- a/pkgs/applications/misc/lutris/chrootenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -97,7 +97,7 @@ in buildFHSUserEnv {
     libcap libtiff libva libgphoto2 libxslt 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 gnutls p11-kit libbsd
+    vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd harfbuzz
 
     # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"