pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #208720 from wegank/xtreemfs-boost

xtreemfs: unbreak on aarch64-linux

authored by Jörg Thalheim and committed by GitHub a1ed7e7b c4294766

+27 -11
unified split
+26 -9
pkgs/tools/filesystems/xtreemfs/default.nix
··· 9 9 , cmake 10 10 , file 11 11 , fuse 12 - , jdk 12 + , jdk8 13 13 , openssl 14 14 , python3 15 15 , valgrind ··· 17 17 }: 18 18 19 19 stdenv.mkDerivation { 20 + pname = "XtreemFS"; 21 + # using unstable release because stable (v1.5.1) has broken repl java plugin 22 + version = "unstable-2015-06-17"; 23 + 20 24 src = fetchFromGitHub { 21 - # using unstable release because stable (v1.5.1) has broken repl java plugin 22 25 rev = "7ddcb081aa125b0cfb008dc98addd260b8353ab3"; 23 26 owner = "xtreemfs"; 24 27 repo = "xtreemfs"; 25 28 sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0"; 26 29 }; 27 30 28 - pname = "XtreemFS"; 29 - version = "1.5.1.81"; 30 - 31 31 nativeBuildInputs = [ makeWrapper python3 ]; 32 32 buildInputs = [ which attr ]; 33 33 34 34 patches = [ 35 35 (fetchpatch { 36 + name = "protobuf-add-arm64-atomicops.patch"; 37 + url = "https://github.com/protocolbuffers/protobuf/commit/2ca19bd8066821a56f193e7fca47139b25c617ad.patch"; 38 + stripLen = 1; 39 + extraPrefix = "cpp/thirdparty/protobuf-2.5.0/"; 40 + sha256 = "sha256-hlL5ZiJhpO3fPpcSTV+yki4zahg/OhFdIZEGF1TNTe0="; 41 + }) 42 + (fetchpatch { 43 + name = "protobuf-add-aarch64-architecture-to-platform-macros.patch"; 44 + url = "https://github.com/protocolbuffers/protobuf/commit/f0b6a5cfeb5f6347c34975446bda08e0c20c9902.patch"; 45 + stripLen = 1; 46 + extraPrefix = "cpp/thirdparty/protobuf-2.5.0/"; 47 + sha256 = "sha256-VRl303x9g5ES/LMODcAdhsPiEmQTq/qXhE/DfvLXF84="; 48 + }) 49 + (fetchpatch { 50 + name = "xtreemfs-fix-for-boost-version-1.66.patch"; 51 + url = "https://github.com/xtreemfs/xtreemfs/commit/aab843cb115ab0739edf7f58fd2d4553a05374a8.patch"; 52 + sha256 = "sha256-y/vXI/PT1TwSy8/73+RKIgKq4pZ9i22MBxr6jo/M5l8="; 53 + }) 54 + (fetchpatch { 55 + name = "xtreemfs-fix-for-openssl_1_1.patch"; 36 56 url = "https://github.com/xtreemfs/xtreemfs/commit/ebfdc2fff56c09f310159d92026883941e42a953.patch"; 37 57 sha256 = "075w00ad88qm6xpm5679m0gfzkrc53w17sk7ycybf4hzxjs29ygy"; 38 - name = "xtreemfs-fix-for-openssl_1_1"; 39 58 }) 40 59 ]; 41 60 42 61 preConfigure = '' 43 - export JAVA_HOME=${jdk} 62 + export JAVA_HOME=${jdk8} 44 63 export ANT_HOME=${ant} 45 64 46 65 export BOOST_INCLUDEDIR=${boost.dev}/include ··· 90 109 maintainers = with lib.maintainers; [ raskin matejc ]; 91 110 platforms = lib.platforms.linux; 92 111 license = lib.licenses.bsd3; 93 - # never built on aarch64-linux since first introduction in nixpkgs 94 - broken = stdenv.isLinux && stdenv.isAarch64; 95 112 }; 96 113 }
+1 -2
pkgs/top-level/all-packages.nix
··· 13353 13353 }; 13354 13354 13355 13355 xtreemfs = callPackage ../tools/filesystems/xtreemfs { 13356 - boost = boost165; 13357 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 13356 + boost = boost17x; 13358 13357 }; 13359 13358 13360 13359 xurls = callPackage ../tools/text/xurls {};