gnome.nautilus: 43.alpha → 43.beta
https://gitlab.gnome.org/GNOME/nautilus/-/compare/43.alpha...43.beta Also change the environment variable name to prevent crashes when running in an old environment. Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
parent
accf115eb5
commit
0e989a5bd9
5 changed files with 11 additions and 6 deletions
|
@ -520,7 +520,7 @@ in
|
|||
|
||||
# Let nautilus find extensions
|
||||
# TODO: Create nautilus-with-extensions package
|
||||
environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
|
||||
environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-4";
|
||||
|
||||
# Override default mimeapps for nautilus
|
||||
environment.sessionVariables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ];
|
||||
|
|
|
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
|||
nautilus
|
||||
];
|
||||
|
||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
|
||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-4";
|
||||
|
||||
postPatch = ''
|
||||
chmod +x postinstall.py # patchShebangs requires executable file
|
||||
|
|
|
@ -23,23 +23,25 @@
|
|||
, tracker-miners
|
||||
, gexiv2
|
||||
, libselinux
|
||||
, libcloudproviders
|
||||
, gdk-pixbuf
|
||||
, substituteAll
|
||||
, gnome-desktop
|
||||
, gst_all_1
|
||||
, gsettings-desktop-schemas
|
||||
, gnome-user-share
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nautilus";
|
||||
version = "43.alpha";
|
||||
version = "43.beta";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "hjVoot3dHPgTNmbDe4Cwf4AN6Wbomh0l4QM0mP+iw5k=";
|
||||
sha256 = "5SEptSc/ZBb///prJr00pWrLfUXltuCVU1UpOhZXkfU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -70,6 +72,7 @@ stdenv.mkDerivation rec {
|
|||
gnome-desktop
|
||||
gnome.adwaita-icon-theme
|
||||
gsettings-desktop-schemas
|
||||
gnome-user-share
|
||||
gst_all_1.gst-plugins-base
|
||||
gtk4
|
||||
libadwaita
|
||||
|
@ -78,6 +81,8 @@ stdenv.mkDerivation rec {
|
|||
libnotify
|
||||
libseccomp
|
||||
libselinux
|
||||
gdk-pixbuf
|
||||
libcloudproviders
|
||||
shared-mime-info
|
||||
tracker
|
||||
tracker-miners
|
||||
|
|
|
@ -13,7 +13,7 @@ index 6273a76..4adcc8a 100644
|
|||
initialized = TRUE;
|
||||
|
||||
- load_module_dir (NAUTILUS_EXTENSIONDIR);
|
||||
+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
|
||||
+ extensiondir = g_getenv ("NAUTILUS_4_EXTENSION_DIR");
|
||||
+ if (extensiondir == NULL) {
|
||||
+ extensiondir = NAUTILUS_EXTENSIONDIR;
|
||||
+ }
|
||||
|
|
|
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||
"PYTHON_LIB_LOC=${python3}/lib"
|
||||
];
|
||||
|
||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
|
||||
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-4";
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
|
|
Loading…
Reference in a new issue