From 7ea8d2b2bef1a1e315dd618bf7edc5c0dff546ca Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Sat, 10 Feb 2024 09:08:28 +0100 Subject: [PATCH] nfs-ganesha: add tools output for mount.9P helper The nfs-ganesha mount.9P helper is a standalone shell script that makes some aspects of mounting a 9P filesystem easier, e.g. instead of: mount -t 9p 192.168.10.2 /mnt -oaname=/home it allows the familiar syntax: mount -t 9P 192.168.10.2:/home /mnt As the mount helper is independent of the server, it's added as separate output. --- pkgs/servers/nfs-ganesha/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 5f32437970c9..54f0cdbd4857 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; version = "5.7"; + outputs = [ "out" "tools" ]; src = fetchFromGitHub { owner = "nfs-ganesha"; @@ -43,10 +44,18 @@ stdenv.mkDerivation rec { nfs-utils ]; + postPatch = '' + substituteInPlace src/tools/mount.9P --replace "/bin/mount" "/usr/bin/env mount" + ''; + postFixup = '' patchelf --add-rpath $out/lib $out/bin/ganesha.nfsd ''; + postInstall = '' + install -Dm755 $src/src/tools/mount.9P $tools/bin/mount.9P + ''; + meta = with lib; { description = "NFS server that runs in user space"; homepage = "https://github.com/nfs-ganesha/nfs-ganesha/wiki"; @@ -54,5 +63,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl3Plus; mainProgram = "ganesha.nfsd"; + outputsToInstall = [ "out" "tools" ]; }; }