From f87196c84d5ea867eaffac6065eb1fb0584ebcf7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 18 Jun 2023 10:26:34 +0200 Subject: [PATCH 1/2] nfs-ganesha: 5.5 -> 5.5.1 --- pkgs/servers/nfs-ganesha/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 16e649684df6..59a019e84cd1 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "5.5"; + version = "5.5.1"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-ebnR/ukbVTwpFNzGf189NmsaDh97ThEGWew5kp50UGg="; + sha256 = "sha256-fbulqSRHPdlpoLH391/axxtjJ7G/9lH9BdqoLKRuIuE="; }; preConfigure = "cd src"; @@ -42,6 +42,10 @@ stdenv.mkDerivation rec { nfs-utils ]; + postFixup = '' + patchelf --add-rpath $out/lib $out/bin/ganesha.nfsd + ''; + meta = with lib; { description = "NFS server that runs in user space"; homepage = "https://github.com/nfs-ganesha/nfs-ganesha/wiki"; From d500f40c4f24dcfac88bd6701250507b8e6bb135 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 3 Aug 2023 23:33:17 +0200 Subject: [PATCH 2/2] nfs-ganesha: fix rpath issue --- pkgs/servers/nfs-ganesha/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 59a019e84cd1..440471a86a9e 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { "-DSYSSTATEDIR=/var" "-DENABLE_VFS_POSIX_ACL=ON" "-DUSE_ACL_MAPPING=ON" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ]; nativeBuildInputs = [