diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-01-05 10:20:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 10:20:05 +0000 |
| commit | 2b44ec2e1333053c0ed07c08a701d7b1db33a128 (patch) | |
| tree | 7eefa591edca868f87893b54b68b6c23edb0ea10 /pkgs/tools/filesystems/glusterfs | |
| parent | 3b7193604f8b05dcb08afab8801203825bd966c1 (diff) | |
| parent | 06e16f00c489fe34d03baa9fadf393d5174243bb (diff) | |
Merge pull request #21674 from fduraffourg/glusterfs
glusterfs: fix mount.glusterfs installation
Diffstat (limited to 'pkgs/tools/filesystems/glusterfs')
| -rw-r--r-- | pkgs/tools/filesystems/glusterfs/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 745d968cce18..5f56b52ea26f 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline, autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite - , liburcu, attr + , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which }: let s = # Generated upstream information @@ -15,7 +15,7 @@ let buildInputs = [ fuse bison flex_2_5_35 openssl python2 ncurses readline autoconf automake libtool pkgconfig zlib libaio libxml2 - acl sqlite liburcu attr + acl sqlite liburcu attr makeWrapper ]; # Some of the headers reference acl propagatedBuildInputs = [ @@ -32,7 +32,7 @@ rec { ''; configureFlags = [ - ''--with-mountutildir="$out/sbin" --localstatedir=/var'' + ''--localstatedir=/var'' ]; makeFlags = "DESTDIR=$(out)"; @@ -48,6 +48,7 @@ rec { postInstall = '' cp -r $out/$out/* $out rm -r $out/nix + wrapProgram $out/sbin/mount.glusterfs --set PATH "${stdenv.lib.makeBinPath [ coreutils gnused attr gnugrep which]}" ''; src = fetchurl { |