Merge pull request #21674 from fduraffourg/glusterfs

glusterfs: fix mount.glusterfs installation

authored by Michael Raskin and committed by GitHub 2b44ec2e 3b719360

+4 -3
+4 -3
pkgs/tools/filesystems/glusterfs/default.nix
··· 1 1 {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline, 2 2 autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite 3 - , liburcu, attr 3 + , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which 4 4 }: 5 5 let 6 6 s = # Generated upstream information ··· 15 15 buildInputs = [ 16 16 fuse bison flex_2_5_35 openssl python2 ncurses readline 17 17 autoconf automake libtool pkgconfig zlib libaio libxml2 18 - acl sqlite liburcu attr 18 + acl sqlite liburcu attr makeWrapper 19 19 ]; 20 20 # Some of the headers reference acl 21 21 propagatedBuildInputs = [ ··· 32 32 ''; 33 33 34 34 configureFlags = [ 35 - ''--with-mountutildir="$out/sbin" --localstatedir=/var'' 35 + ''--localstatedir=/var'' 36 36 ]; 37 37 38 38 makeFlags = "DESTDIR=$(out)"; ··· 48 48 postInstall = '' 49 49 cp -r $out/$out/* $out 50 50 rm -r $out/nix 51 + wrapProgram $out/sbin/mount.glusterfs --set PATH "${stdenv.lib.makeBinPath [ coreutils gnused attr gnugrep which]}" 51 52 ''; 52 53 53 54 src = fetchurl {