diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2019-10-04 17:50:55 +0200 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2019-10-04 20:37:24 +0200 |
commit | 47723057e5ec5cf704e3099d78e0eb15fad200f9 (patch) | |
tree | 9492dcc5aac68af23bf9e0384f3b3c8087c18301 /pkgs/tools/filesystems | |
parent | 141b7210cb0f4684d8c88f4c870cf1e6663c47a2 (diff) | |
download | nixpkgs-47723057e5ec5cf704e3099d78e0eb15fad200f9.tar nixpkgs-47723057e5ec5cf704e3099d78e0eb15fad200f9.tar.gz nixpkgs-47723057e5ec5cf704e3099d78e0eb15fad200f9.tar.bz2 nixpkgs-47723057e5ec5cf704e3099d78e0eb15fad200f9.tar.lz nixpkgs-47723057e5ec5cf704e3099d78e0eb15fad200f9.tar.xz nixpkgs-47723057e5ec5cf704e3099d78e0eb15fad200f9.tar.zst nixpkgs-47723057e5ec5cf704e3099d78e0eb15fad200f9.zip |
xtreemfs: fix build with openssl-1.1
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/xtreemfs/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 436037245bb..d8d41450079 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,5 +1,5 @@ { stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python -, lib, valgrind, makeWrapper, fetchFromGitHub }: +, lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { src = fetchFromGitHub { @@ -15,6 +15,14 @@ stdenv.mkDerivation { buildInputs = [ which attr makeWrapper python ]; + patches = [ + (fetchpatch { + url = "https://github.com/xtreemfs/xtreemfs/commit/ebfdc2fff56c09f310159d92026883941e42a953.patch"; + sha256 = "075w00ad88qm6xpm5679m0gfzkrc53w17sk7ycybf4hzxjs29ygy"; + name = "xtreemfs-fix-for-openssl_1_1"; + }) + ]; + preConfigure = '' export JAVA_HOME=${jdk} export ANT_HOME=${ant} @@ -66,6 +74,5 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ raskin matejc ]; platforms = lib.platforms.linux; license = lib.licenses.bsd3; - broken = true; # does not support openssl 1.1 }; } |