diff options
author | Rickard Nilsson <rickynils@gmail.com> | 2014-06-23 16:33:37 +0200 |
---|---|---|
committer | Rickard Nilsson <rickynils@gmail.com> | 2014-06-23 16:33:37 +0200 |
commit | 3bf8199613f8ecfff93e0ee25eee160777d6cb08 (patch) | |
tree | 8b71c74367ae7a0da0636e4716eb16a849a6c5bb | |
parent | f2909d07638cceccb28a32d0ccc957f2b6725448 (diff) | |
parent | 470f8cccc250ebab59cc76cb7ccdfa596ce694f5 (diff) | |
download | nixlib-3bf8199613f8ecfff93e0ee25eee160777d6cb08.tar nixlib-3bf8199613f8ecfff93e0ee25eee160777d6cb08.tar.gz nixlib-3bf8199613f8ecfff93e0ee25eee160777d6cb08.tar.bz2 nixlib-3bf8199613f8ecfff93e0ee25eee160777d6cb08.tar.lz nixlib-3bf8199613f8ecfff93e0ee25eee160777d6cb08.tar.xz nixlib-3bf8199613f8ecfff93e0ee25eee160777d6cb08.tar.zst nixlib-3bf8199613f8ecfff93e0ee25eee160777d6cb08.zip |
Merge pull request #3070 from proger/glusterfs-3.5
glusterfs: update to 3.5.0
-rw-r--r-- | pkgs/tools/filesystems/glusterfs/default.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 5a09ec2a80b9..1c843a666360 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,25 +1,36 @@ -{stdenv, fetchurl, fuse, bison, flex, openssl, python, ncurses, readline}: +{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline, + autoconf, automake, libtool, pkgconfig, zlib, libaio}: let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.4.3"; + version="3.5.0"; name="${baseName}-${version}"; - hash="1vzdihsy4da11jsa46n1n2xk6d40g7v0zrlqvs3pb9k07fql5kag"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.3/glusterfs-3.4.3.tar.gz"; - sha256="0j1yvpdb1bydsh3pqlyr23mfvra5bap9rxba910s9cn61mpy99bj"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.0/glusterfs-3.5.0.tar.gz"; + sha256="0d9jlgxg19f2ajf5i4yw4f91n161rsi8fm95442ckci3xnz21zir"; }; buildInputs = [ - fuse bison flex openssl python ncurses readline + fuse bison flex_2_5_35 openssl python ncurses readline + autoconf automake libtool pkgconfig zlib libaio ]; in stdenv.mkDerivation rec { inherit (s) name version; inherit buildInputs; + preConfigure = '' + ./autogen.sh + ''; configureFlags = [ ''--with-mountutildir="$out/sbin"'' ]; + preInstall = '' + substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out + substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out + substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out + substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out + substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out + ''; src = fetchurl { inherit (s) url sha256; }; |