JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfs-ganesha: 3.5 -> 4.0

Browse Source
This commit is contained in:
Markus Kowalewski 2021-12-30 13:15:30 +01:00
parent 23a43ab2f4
commit c32831e563
No known key found for this signature in database
GPG Key ID: D865C8A91D7025EB
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/nfs-ganesha/default.nix
View File

@ -5,17 +5,15 @@
stdenv.mkDerivation rec {
pname = "nfs-ganesha";
version = "3.5";
version = "4.0";
src = fetchFromGitHub {
owner = "nfs-ganesha";
repo = "nfs-ganesha";
rev = "V${version}";
sha256 = "sha256-N0qVlnMshsEcWEpPhtR+zXwFKXlik1XnEuZdFMjpZTE=";
sha256 = "1zv7aprmydyjs53xnn1h1s6xxb22pic7va23459zq0nfnhmsgd26";
};
patches = [ ./sysstatedir.patch ];
preConfigure = "cd src";
cmakeFlags = [ "-DUSE_SYSTEM_NTIRPC=ON" ];

22
pkgs/servers/nfs-ganesha/sysstatedir.patch
View File

@ -1,22 +0,0 @@
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 2a5795e9f..7314e0594 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -71,13 +71,13 @@
#cmakedefine HAVE_URCU_REF_GET_UNLESS_ZERO 1
#define NFS_GANESHA 1
-#define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf"
-#define GANESHA_PIDFILE_PATH "@SYSSTATEDIR@/run/ganesha.pid"
-#define NFS_V4_RECOV_ROOT "@SYSSTATEDIR@/lib/nfs/ganesha"
+#define GANESHA_CONFIG_PATH "/etc/ganesha/ganesha.conf"
+#define GANESHA_PIDFILE_PATH "/run/ganesha.pid"
+#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha"
/**
* @brief Default value for krb5_param.ccache_dir
*/
-#define DEFAULT_NFS_CCACHE_DIR "@SYSSTATEDIR@/run/ganesha"
+#define DEFAULT_NFS_CCACHE_DIR "/run/ganesha"
/* We're LGPL'd */
#define _LGPL_SOURCE 1