diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-11-30 15:38:11 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2021-11-30 15:38:11 +0800 |
| commit | 0a989ec7caa63aabd47b4aff5aecd5a754cd6cea (patch) | |
| tree | b53dcd8c413e0116c4db0b00e0bda3b46a591a09 | |
| parent | pantheon.elementary-files: 6.0.4 -> 6.1.0 (diff) | |
| download | nixpkgs-0a989ec7caa63aabd47b4aff5aecd5a754cd6cea.tar.gz | |
pantheon.elementary-files: drop filechooser-portal-hardcode-gsettings-for-nixos.patch
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-files/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch | 24 |
2 files changed, 1 insertions, 31 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 91dc48cf1c2f..747f9662680d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { bamf elementary-dock elementary-icon-theme + glib granite gtk3 libcanberra @@ -82,16 +83,9 @@ stdenv.mkDerivation rec { zeitgeist ]; - patches = [ - ./filechooser-portal-hardcode-gsettings-for-nixos.patch - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py - - substituteInPlace filechooser-portal/FileChooserDialog.vala \ - --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch b/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch deleted file mode 100644 index 9ad9ee542728..000000000000 --- a/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 256d80aa2ab2b84316260d0be5263b02fd5e796f Mon Sep 17 00:00:00 2001 -From: Bobby Rong <rjl931189261@126.com> -Date: Tue, 30 Nov 2021 10:24:39 +0800 -Subject: [PATCH] filechooser-portal: hardcode gsettings for nixos - ---- - filechooser-portal/FileChooserDialog.vala | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -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 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 settings = new Settings.full (chooser_schema, null, null); - int width, height; - - settings.get ("window-size", "(ii)", out width, out height); |