pantheon.elementary-files: 6.0.4 -> 6.1.0

pkgs/desktops/pantheon/apps/elementary-files/default.nix

@@ -32,7 +32,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-files";
-  version = "6.0.4";
+  version = "6.1.0";
 
   repoName = "files";
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "sha256-FH6EYtgKADp8jjBoCwsdRdknlKS9v3iOtPiT3CyEc/8=";
+    sha256 = "sha256-aGiFEeSvDV5rPD2Ll/BuDoWclEPhR1UuoCxUSS9CGmw=";
   };
 
   passthru = {
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
     chmod +x meson/post_install.py
     patchShebangs meson/post_install.py
 
-    substituteInPlace filechooser-portal/LegacyFileChooserDialog.vala \
+    substituteInPlace filechooser-portal/FileChooserDialog.vala \
       --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
   '';
 

pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch

@@ -1,24 +1,24 @@
-From 726ab4c0ab01273cb2197e4c151a5b69ff0954b6 Mon Sep 17 00:00:00 2001
+From 256d80aa2ab2b84316260d0be5263b02fd5e796f Mon Sep 17 00:00:00 2001
 From: Bobby Rong <rjl931189261@126.com>
-Date: Fri, 16 Jul 2021 18:24:58 +0800
+Date: Tue, 30 Nov 2021 10:24:39 +0800
 Subject: [PATCH] filechooser-portal: hardcode gsettings for nixos
 
 ---
- filechooser-portal/LegacyFileChooserDialog.vala | 4 +++-
+ filechooser-portal/FileChooserDialog.vala | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/filechooser-portal/LegacyFileChooserDialog.vala b/filechooser-portal/LegacyFileChooserDialog.vala
-index 330718f..f383bb1 100644
---- a/filechooser-portal/LegacyFileChooserDialog.vala
-+++ b/filechooser-portal/LegacyFileChooserDialog.vala
-@@ -60,7 +60,9 @@ public class Files.LegacyFileChooserDialog : Object {
-         /* If not local only during creation, strange bug occurs on fresh installs */
-         chooser_dialog.local_only = true;
+diff --git a/filechooser-portal/FileChooserDialog.vala b/filechooser-portal/FileChooserDialog.vala
+index 4a84016db..4bf2b32a1 100755
+--- a/filechooser-portal/FileChooserDialog.vala
++++ b/filechooser-portal/FileChooserDialog.vala
+@@ -160,7 +160,9 @@ public class Files.FileChooserDialog : Hdy.Window, Xdp.Request {
+         accept_button.grab_default ();
+         setup_chooser ();
  
--        var chooser_settings = new Settings ("io.elementary.files.file-chooser");
+-        var settings = new Settings ("io.elementary.files.file-chooser");
 +        SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
 +        SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false);
-+        var chooser_settings = new Settings.full (chooser_schema, null, null);
- 
-         action_area = (Gtk.ButtonBox) chooser_dialog.get_action_area ();
++        var settings = new Settings.full (chooser_schema, null, null);
+         int width, height;
  
+         settings.get ("window-size", "(ii)", out width, out height);