diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2020-02-12 14:51:18 -0300 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2020-02-12 14:51:18 -0300 |
| commit | c17f188de0de013827e453d4f6748b901b386731 (patch) | |
| tree | 089ef661ff93b2bac59b9b714be28d3f2135ccac /pkgs/desktops/mate | |
| parent | 21fceb367f2237a0498c485ff6cd1e8fed815ec7 (diff) | |
| download | nixpkgs-c17f188de0de013827e453d4f6748b901b386731.tar nixpkgs-c17f188de0de013827e453d4f6748b901b386731.tar.gz nixpkgs-c17f188de0de013827e453d4f6748b901b386731.tar.bz2 nixpkgs-c17f188de0de013827e453d4f6748b901b386731.tar.lz nixpkgs-c17f188de0de013827e453d4f6748b901b386731.tar.xz nixpkgs-c17f188de0de013827e453d4f6748b901b386731.tar.zst nixpkgs-c17f188de0de013827e453d4f6748b901b386731.zip | |
mate.caja: 1.22.3 -> 1.24.0
Diffstat (limited to 'pkgs/desktops/mate')
| -rw-r--r-- | pkgs/desktops/mate/caja/caja-extension-dirs.patch | 22 | ||||
| -rw-r--r-- | pkgs/desktops/mate/caja/default.nix | 6 |
2 files changed, 22 insertions, 6 deletions
diff --git a/pkgs/desktops/mate/caja/caja-extension-dirs.patch b/pkgs/desktops/mate/caja/caja-extension-dirs.patch index 7490a368efd..0b1453bd468 100644 --- a/pkgs/desktops/mate/caja/caja-extension-dirs.patch +++ b/pkgs/desktops/mate/caja/caja-extension-dirs.patch @@ -1,11 +1,24 @@ +From 35e9e6a6f3ba6cbe62a3957044eb67864f5d8e66 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> +Date: Tue, 11 Feb 2020 17:49:13 -0300 +Subject: [PATCH] Look for caja extentions at $CAJA_EXTENTSION_DIRS + +CAJA_EXTENSION_DIRS is a list of paths where caja extensions are +looked for. It is needed for distributions like NixOS that do not +install all extensions in the same directory. In NixOS each package is +installed in a self contained directory. +--- + libcaja-private/caja-module.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c -index 023c22e..414913b 100644 +index d54d7cf..9794e56 100644 --- a/libcaja-private/caja-module.c +++ b/libcaja-private/caja-module.c -@@ -258,11 +258,25 @@ caja_module_setup (void) +@@ -258,11 +258,25 @@ void + caja_module_setup (void) { static gboolean initialized = FALSE; - GList *res; + gchar *caja_extension_dirs; + gchar **dir_vector; @@ -28,3 +41,6 @@ index 023c22e..414913b 100644 load_module_dir (CAJA_EXTENSIONDIR); eel_debug_call_at_shutdown (free_module_objects); +-- +2.25.0 + diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index c460a2cf2dc..6508dfa3b8d 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja"; - version = "1.22.3"; + version = "1.24.0"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1w2liq9h1kr5zyaaq82xz8pic04qi5sra8kaycfg1iddmknkfqn7"; + sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0"; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "File manager for the MATE desktop"; - homepage = https://mate-desktop.org; + homepage = "https://mate-desktop.org"; license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; |