diff options
| author | Colin <colin@uninsane.org> | 2023-10-24 16:03:57 +0000 |
|---|---|---|
| committer | Colin <colin@uninsane.org> | 2023-10-25 08:20:38 +0000 |
| commit | 909df81605bfc746bf431acfa2f7e8a83f0f5b41 (patch) | |
| tree | 9a2209dc11adaae56713a36c1ca9ed18ba97eef6 | |
| parent | 5655c7f0be9e63d2511345c74452c099f86eddb6 (diff) | |
| download | nixpkgs-909df81605bfc746bf431acfa2f7e8a83f0f5b41.tar nixpkgs-909df81605bfc746bf431acfa2f7e8a83f0f5b41.tar.gz nixpkgs-909df81605bfc746bf431acfa2f7e8a83f0f5b41.tar.bz2 nixpkgs-909df81605bfc746bf431acfa2f7e8a83f0f5b41.tar.lz nixpkgs-909df81605bfc746bf431acfa2f7e8a83f0f5b41.tar.xz nixpkgs-909df81605bfc746bf431acfa2f7e8a83f0f5b41.tar.zst nixpkgs-909df81605bfc746bf431acfa2f7e8a83f0f5b41.zip | |
gvfs: support cross compilation
| -rw-r--r-- | pkgs/development/libraries/gvfs/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/gvfs/hardcode-ssh-path.patch | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 7fd4572e0b7..b88daae22db 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -5,6 +5,7 @@ , meson , ninja , pkg-config +, substituteAll , gettext , dbus , glib @@ -53,12 +54,9 @@ stdenv.mkDerivation rec { }; 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; + (substituteAll { + src = ./hardcode-ssh-path.patch; + ssh_program = "${lib.getBin openssh}/bin/ssh"; }) ]; @@ -76,7 +74,6 @@ stdenv.mkDerivation rec { pkg-config gettext wrapGAppsHook - libxml2 libxslt docbook_xsl docbook_xml_dtd_42 @@ -92,7 +89,7 @@ stdenv.mkDerivation rec { libimobiledevice libbluray libnfs - openssh + libxml2 gsettings-desktop-schemas libsoup_3 ] ++ lib.optionals udevSupport [ diff --git a/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch b/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch new file mode 100644 index 00000000000..aaf8e291aa8 --- /dev/null +++ b/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch @@ -0,0 +1,13 @@ +diff --git a/daemon/meson.build b/daemon/meson.build +index 72a16890..718944e1 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -256,7 +256,7 @@ if enable_sftp + '-DDEFAULT_BACKEND_TYPE=sftp', + '-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,', + '-DMAX_JOB_THREADS=1', +- '-DSSH_PROGRAM="ssh"', ++ '-DSSH_PROGRAM="@ssh_program@"', + ] + + programs += {'gvfsd-sftp': {'sources': sources, 'dependencies': deps, 'c_args': cflags}} |