Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 141b7210cb0f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 47723057e5ec
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 4, 2019

  1. xtreemfs: fix build with openssl-1.1

    @7c6f434c
    7c6f434c committed Oct 4, 2019
    Copy the full SHA
    4772305 View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/tools/filesystems/xtreemfs/default.nix
11 changes: 9 additions & 2 deletions pkgs/tools/filesystems/xtreemfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
};
}