pyrox.dev
lol
gvfs: support cross compilation
+18
-8
+5
-8
pkgs/development/libraries/gvfs/default.nix
+5
-8
pkgs/development/libraries/gvfs/default.nix
···
5
5
, meson
6
6
, ninja
7
7
, pkg-config
8
+
, substituteAll
8
9
, gettext
9
10
, dbus
10
11
, glib
···
53
54
};
54
55
55
56
patches = [
56
-
# Hardcode the ssh path again.
57
-
# https://gitlab.gnome.org/GNOME/gvfs/-/issues/465
58
-
(fetchpatch2 {
59
-
url = "https://gitlab.gnome.org/GNOME/gvfs/-/commit/8327383e262e1e7f32750a8a2d3dd708195b0f53.patch";
60
-
hash = "sha256-ReD7qkezGeiJHyo9jTqEQNBjECqGhV9nSD+dYYGZWJ8=";
61
-
revert = true;
57
+
(substituteAll {
58
+
src = ./hardcode-ssh-path.patch;
59
+
ssh_program = "${lib.getBin openssh}/bin/ssh";
62
60
})
63
61
];
64
62
···
76
74
pkg-config
77
75
gettext
78
76
wrapGAppsHook
79
-
libxml2
80
77
libxslt
81
78
docbook_xsl
82
79
docbook_xml_dtd_42
···
92
89
libimobiledevice
93
90
libbluray
94
91
libnfs
95
-
openssh
92
+
libxml2
96
93
gsettings-desktop-schemas
97
94
libsoup_3
98
95
] ++ lib.optionals udevSupport [
+13
pkgs/development/libraries/gvfs/hardcode-ssh-path.patch
+13
pkgs/development/libraries/gvfs/hardcode-ssh-path.patch
···
1
+
diff --git a/daemon/meson.build b/daemon/meson.build
2
+
index 72a16890..718944e1 100644
3
+
--- a/daemon/meson.build
4
+
+++ b/daemon/meson.build
5
+
@@ -256,7 +256,7 @@ if enable_sftp
6
+
'-DDEFAULT_BACKEND_TYPE=sftp',
7
+
'-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,',
8
+
'-DMAX_JOB_THREADS=1',
9
+
- '-DSSH_PROGRAM="ssh"',
10
+
+ '-DSSH_PROGRAM="@ssh_program@"',
11
+
]
12
+
13
+
programs += {'gvfsd-sftp': {'sources': sources, 'dependencies': deps, 'c_args': cflags}}