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>
This commit is contained in:
parent
4d7d8c5e5e
commit
25f94780dd
|
@ -1,6 +1,7 @@
|
||||||
{ stdenv
|
{ stdenv
|
||||||
, lib
|
, lib
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
, fetchpatch2
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -44,13 +45,23 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gvfs";
|
pname = "gvfs";
|
||||||
version = "1.50.2";
|
version = "1.50.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
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 = ''
|
postPatch = ''
|
||||||
# patchShebangs requires executable file
|
# patchShebangs requires executable file
|
||||||
chmod +x meson_post_install.py
|
chmod +x meson_post_install.py
|
||||||
|
|
Loading…
Reference in a new issue