nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-26 10:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

nautilus: 3.34.2 -> 3.34.3

Browse Source
This commit is contained in:
Daniel Șerbănescu
2020-07-13 13:31:43 +02:00
parent 5272327b81
commit b7709efc78
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/core/nautilus/default.nix
View File

@@ -32,11 +32,11 @@
stdenv.mkDerivation rec {
pname = "nautilus";
version = "3.34.2";
version = "3.34.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19zqwq4qyyncc5wq3xls0f7rsavnw741k336p2h7kx35p4kf41mv";
sha256 = "0vdk3mw32j81n57m006rbgjhsy57q86cgxbblrx4m8zkjjvq9n82";
};
nativeBuildInputs = [

18
pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch
View File

@@ -1,24 +1,24 @@
diff --git a/src/nautilus-module.c b/src/nautilus-module.c
index 6273a76..4adcc8a 100644
index bf474bd6f..93e798aa6 100644
--- a/src/nautilus-module.c
+++ b/src/nautilus-module.c
@@ -242,11 +242,17 @@ void
@@ -254,12 +254,18 @@ void
nautilus_module_setup (void)
{
static gboolean initialized = FALSE;
+ const gchar* extensiondir = NULL;
if (!initialized)
{
initialized = TRUE;
- load_module_dir (NAUTILUS_EXTENSIONDIR);
+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
+ if (extensiondir == NULL) {
+ extensiondir = NAUTILUS_EXTENSIONDIR;
+ }
+ if (extensiondir == NULL) {
+ extensiondir = NAUTILUS_EXTENSIONDIR;
+ }
+
+ load_module_dir (extensiondir);
+ load_module_dir (extensiondir);
eel_debug_call_at_shutdown (free_module_objects);
}