b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #208720 from wegank/xtreemfs-boost

Browse source 
xtreemfs: unbreak on aarch64-linux
This commit is contained in:
Jörg Thalheim 2023-01-02 23:16:08 +01:00 committed by GitHub
parent c42947660e 1231399520
commit a1ed7e7b57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/tools/filesystems/xtreemfs/default.nix
View file

@ -9,7 +9,7 @@
, cmake
, file
, fuse
, jdk
, jdk8
, openssl
, python3
, valgrind
@ -17,30 +17,49 @@
}:
stdenv.mkDerivation {
pname = "XtreemFS";
# using unstable release because stable (v1.5.1) has broken repl java plugin
version = "unstable-2015-06-17";
src = fetchFromGitHub {
# using unstable release because stable (v1.5.1) has broken repl java plugin
rev = "7ddcb081aa125b0cfb008dc98addd260b8353ab3";
owner = "xtreemfs";
repo = "xtreemfs";
sha256 = "1hjmd32pla27zf98ghzz6r5ml8ry86m9dsryv1z01kxv5l95b3m0";
};
pname = "XtreemFS";
version = "1.5.1.81";
nativeBuildInputs = [ makeWrapper python3 ];
buildInputs = [ which attr ];
patches = [
(fetchpatch {
name = "protobuf-add-arm64-atomicops.patch";
url = "https://github.com/protocolbuffers/protobuf/commit/2ca19bd8066821a56f193e7fca47139b25c617ad.patch";
stripLen = 1;
extraPrefix = "cpp/thirdparty/protobuf-2.5.0/";
sha256 = "sha256-hlL5ZiJhpO3fPpcSTV+yki4zahg/OhFdIZEGF1TNTe0=";
})
(fetchpatch {
name = "protobuf-add-aarch64-architecture-to-platform-macros.patch";
url = "https://github.com/protocolbuffers/protobuf/commit/f0b6a5cfeb5f6347c34975446bda08e0c20c9902.patch";
stripLen = 1;
extraPrefix = "cpp/thirdparty/protobuf-2.5.0/";
sha256 = "sha256-VRl303x9g5ES/LMODcAdhsPiEmQTq/qXhE/DfvLXF84=";
})
(fetchpatch {
name = "xtreemfs-fix-for-boost-version-1.66.patch";
url = "https://github.com/xtreemfs/xtreemfs/commit/aab843cb115ab0739edf7f58fd2d4553a05374a8.patch";
sha256 = "sha256-y/vXI/PT1TwSy8/73+RKIgKq4pZ9i22MBxr6jo/M5l8=";
})
(fetchpatch {
name = "xtreemfs-fix-for-openssl_1_1.patch";
url = "https://github.com/xtreemfs/xtreemfs/commit/ebfdc2fff56c09f310159d92026883941e42a953.patch";
sha256 = "075w00ad88qm6xpm5679m0gfzkrc53w17sk7ycybf4hzxjs29ygy";
name = "xtreemfs-fix-for-openssl_1_1";
})
];
preConfigure = ''
export JAVA_HOME=${jdk}
export JAVA_HOME=${jdk8}
export ANT_HOME=${ant}
export BOOST_INCLUDEDIR=${boost.dev}/include
@ -90,7 +109,5 @@ stdenv.mkDerivation {
maintainers = with lib.maintainers; [ raskin matejc ];
platforms = lib.platforms.linux;
license = lib.licenses.bsd3;
# never built on aarch64-linux since first introduction in nixpkgs
broken = stdenv.isLinux && stdenv.isAarch64;
};
}

3
pkgs/top-level/all-packages.nix
View file

@ -13353,8 +13353,7 @@ with pkgs;
};
xtreemfs = callPackage ../tools/filesystems/xtreemfs {
boost = boost165;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
boost = boost17x;
};
xurls = callPackage ../tools/text/xurls {};