From 5d016c54e3a09f18aec8c4cc0e20f410e3793b84 Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Wed, 6 Apr 2022 00:41:51 +0200
Subject: [PATCH] Add Lutris

---
 modules/lutris_sort_new_with_model_fix.patch | 26 --------------------
 users/default.nix                            |  8 +-----
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 modules/lutris_sort_new_with_model_fix.patch

diff --git a/modules/lutris_sort_new_with_model_fix.patch b/modules/lutris_sort_new_with_model_fix.patch
deleted file mode 100644
index 4dfb6cf..0000000
--- a/modules/lutris_sort_new_with_model_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 12a458db3c590c3f1972594e091a24cb4d65b610 Mon Sep 17 00:00:00 2001
-From: Mathieu Comandon <strycore@gmail.com>
-Date: Wed, 1 Jan 2020 12:47:55 -0800
-Subject: [PATCH] Support both sort_new_with_model and new_with_model
-
----
- lutris/gui/views/store.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lutris/gui/views/store.py b/lutris/gui/views/store.py
-index 9e843e9e4..8fe5decf5 100644
---- a/lutris/gui/views/store.py
-+++ b/lutris/gui/views/store.py
-@@ -140,7 +140,11 @@ def __init__(
-         self.prevent_sort_update = False  # prevent recursion with signals
-         self.modelfilter = self.store.filter_new()
-         self.modelfilter.set_visible_func(self.filter_view)
--        self.modelsort = Gtk.TreeModelSort.sort_new_with_model(self.modelfilter)
-+        try:
-+            self.modelsort = Gtk.TreeModelSort.sort_new_with_model(self.modelfilter)
-+        except AttributeError:
-+            # Apparently some API breaking changes on GTK minor versions.
-+            self.modelsort = Gtk.TreeModelSort.new_with_model(self.modelfilter)
-         self.modelsort.connect("sort-column-changed", self.on_sort_column_changed)
-         self.modelsort.set_sort_func(sort_col, sort_func, sort_col)
-         self.sort_view(sort_key, sort_ascending)
diff --git a/users/default.nix b/users/default.nix
index f62417e..1552ad8 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -8,13 +8,6 @@
       packageOverrides = pkgs: {
         ncmpcpp = pkgs.ncmpcpp.override { visualizerSupport = true; };
         firefox = pkgs.firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; };
-        lutris-unwrapped = pkgs.lutris-unwrapped.overridePythonAttrs (
-          oldAttrs: rec {
-            patches = [
-              ./lutris_sort_new_with_model_fix.patch
-            ];
-          }
-        );
       };
     };
 
@@ -285,6 +278,7 @@
         linuxPackages.perf
 
         steam
+        lutris
         dolphinEmu
       ];
     };