b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pantheon.elementary-files: 4.4.4 -> 4.5.0

Browse source 
https://github.com/elementary/files/releases/tag/4.5.0
This commit is contained in:
worldofpeace 2020-09-03 19:45:07 -04:00
parent 7dea5d2735
commit 4b64a23f26
3 changed files with 38 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/desktops/pantheon/apps/elementary-files/0001-filechooser-module-hardcode-gsettings-for-nixos.patch Normal file
View file

@ -0,0 +1,35 @@
From f51974c9736c3e28755245d15729578214652343 Mon Sep 17 00:00:00 2001
Message-Id: <f51974c9736c3e28755245d15729578214652343.1599178185.git-series.worldofpeace@protonmail.ch>
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 3 Sep 2020 20:08:15 -0400
Subject: [PATCH] filechooser-module: hardcode gsettings for nixos
---
filechooser-module/FileChooserDialog.vala | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/filechooser-module/FileChooserDialog.vala b/filechooser-module/FileChooserDialog.vala
index a70fe10..08fde2c 100644
--- a/filechooser-module/FileChooserDialog.vala
+++ b/filechooser-module/FileChooserDialog.vala
@@ -60,10 +60,14 @@ public class CustomFileChooserDialog : Object {
/* If not local only during creation, strange bug occurs on fresh installs */
chooser_dialog.local_only = true;
- var files_preferences = new Settings ("io.elementary.files.preferences");
+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
+ SettingsSchema preferences_schema = sss.lookup ("io.elementary.files.preferences", false);
+ SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false);
+
+ var files_preferences = new Settings.full (preferences_schema, null, null);
is_single_click = files_preferences.get_boolean ("single-click");
- var chooser_settings = new Settings ("io.elementary.files.file-chooser");
+ var chooser_settings = new Settings.full (chooser_schema, null, null);
assign_container_box ();
remove_gtk_widgets ();
base-commit: 57cb89b64fd2d5c08f4aaf23e8c74bfaa5d0384f
--
git-series 0.9.1

6
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View file

@ -31,7 +31,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "4.4.4";
version = "4.5.0";
repoName = "files";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "1hsh9kg30l90r2aqrrap1nfmgjf0la8mfd8h4xm6d7acailcnhmb";
sha256 = "sha256-wtQW1poX791DAlSFdVV9psnCfBDeVXI2fDZ2GcvvNn8=";
};
passthru = {
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
];
patches = [
./hardcode-gsettings.patch
./0001-filechooser-module-hardcode-gsettings-for-nixos.patch
];
postPatch = ''

22
pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch
View file

@ -1,22 +0,0 @@
diff --git a/filechooser-module/FileChooserDialog.vala b/filechooser-module/FileChooserDialog.vala
index cb7c3c49..8b1899d1 100644
--- a/filechooser-module/FileChooserDialog.vala
+++ b/filechooser-module/FileChooserDialog.vala
@@ -57,10 +57,15 @@ public class CustomFileChooserDialog : Object {
chooser_dialog.deletable = false;
chooser_dialog.local_only = false;
- var settings = new Settings ("io.elementary.files.preferences");
+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
+ SettingsSchema preferences_schema = sss.lookup ("io.elementary.files.preferences", false);
+ SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false);
+
+ var settings = new Settings.full (preferences_schema, null, null);
+
is_single_click = settings.get_boolean ("single-click");
- var chooser_settings = new Settings ("io.elementary.files.file-chooser");
+ var chooser_settings = new Settings.full (chooser_schema, null, null);
assign_container_box ();
remove_gtk_widgets ();