diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-02-01 22:36:21 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-02-02 23:25:53 +0100 |
| commit | 25f94780dd64de08f9d1d7db714e2969d272a4d3 (patch) | |
| tree | c62c006b5fc78b9ddc795f836928eb6f9132662a /pkgs/development/libraries/gvfs | |
| parent | 4d7d8c5e5e051e11a3711fc6d77be146068f0b80 (diff) | |
gvfs: 1.50.2 → 1.50.3
The daemon no longer hardcodes ssh path (https://gitlab.gnome.org/GNOME/gvfs/-/issues/465). Let’s revert that to make the dependency explicit. Even thought NixOS currently installs `ssh` to system path as required package user services picking it up from there is not guaranteed. https://gitlab.gnome.org/GNOME/gvfs/-/compare/1.50.2...1.50.3 Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/development/libraries/gvfs')
| -rw-r--r-- | pkgs/development/libraries/gvfs/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 37a282c4ccad6..c4604a28a41ec 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , meson , ninja , pkg-config @@ -44,13 +45,23 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.50.2"; + version = "1.50.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "A9crjBXvQ4EQ8M9Fe1ZVJmyLUV0EErMPTVXPoNoGrF4="; + sha256 = "aJcRnpe7FgKdJ3jhpaVKamWSYx+LLzoqHepO8rAYA/0="; }; + patches = [ + # Hardcode the ssh path again. + # https://gitlab.gnome.org/GNOME/gvfs/-/issues/465 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gvfs/-/commit/8327383e262e1e7f32750a8a2d3dd708195b0f53.patch"; + hash = "sha256-ReD7qkezGeiJHyo9jTqEQNBjECqGhV9nSD+dYYGZWJ8="; + revert = true; + }) + ]; + postPatch = '' # patchShebangs requires executable file chmod +x meson_post_install.py |