diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
| commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
| tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch | |
| parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
| parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) | |
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299
Diffstat (limited to 'pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch')
| -rw-r--r-- | pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch index f679fb8f4c1ba..f08d73cf3a654 100644 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch @@ -18,10 +18,10 @@ index f87d8a454..b4d3f5d10 100644 fi GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs" -GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" -+GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/var/lib/misc/glusterfsd" ++GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/lib/misc/glusterfsd" prefix=$old_prefix exec_prefix=$old_exec_prefix - --- + +-- 2.12.0 |