rclone: stop using LD_LIBRARY_PATH for fuse library and match version… (#337474)
This commit is contained in:
commit
3aa37d9998
@ -8,6 +8,8 @@ buildGoModule rec {
|
|||||||
pname = "rclone";
|
pname = "rclone";
|
||||||
version = "1.67.0";
|
version = "1.67.0";
|
||||||
|
|
||||||
|
outputs = [ "out" "man" ];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rclone";
|
owner = "rclone";
|
||||||
repo = "rclone";
|
repo = "rclone";
|
||||||
@ -19,15 +21,19 @@ buildGoModule rec {
|
|||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
outputs = [ "out" "man" ];
|
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||||
|
|
||||||
buildInputs = lib.optional enableCmount (if stdenv.isDarwin then macfuse-stubs else fuse);
|
buildInputs = lib.optional enableCmount (if stdenv.isDarwin then macfuse-stubs else fuse);
|
||||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
|
||||||
|
|
||||||
tags = lib.optionals enableCmount [ "cmount" ];
|
tags = lib.optionals enableCmount [ "cmount" ];
|
||||||
|
|
||||||
ldflags = [ "-s" "-w" "-X github.com/rclone/rclone/fs.Version=${version}" ];
|
ldflags = [ "-s" "-w" "-X github.com/rclone/rclone/fs.Version=${version}" ];
|
||||||
|
|
||||||
|
postConfigure = lib.optionalString (!stdenv.isDarwin) ''
|
||||||
|
substituteInPlace vendor/github.com/winfsp/cgofuse/fuse/host_cgo.go \
|
||||||
|
--replace-fail '"libfuse.so.2"' '"${lib.getLib fuse}/lib/libfuse.so.2"'
|
||||||
|
'';
|
||||||
|
|
||||||
postInstall =
|
postInstall =
|
||||||
let
|
let
|
||||||
rcloneBin =
|
rcloneBin =
|
||||||
@ -50,8 +56,7 @@ buildGoModule rec {
|
|||||||
# as the setuid wrapper is required as non-root on NixOS.
|
# as the setuid wrapper is required as non-root on NixOS.
|
||||||
''
|
''
|
||||||
wrapProgram $out/bin/rclone \
|
wrapProgram $out/bin/rclone \
|
||||||
--suffix PATH : "${lib.makeBinPath [ fuse3 ] }" \
|
--suffix PATH : "${lib.makeBinPath [ fuse3 ] }"
|
||||||
--prefix LD_LIBRARY_PATH : "${fuse3}/lib"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
|
Loading…
Reference in New Issue
Block a user