Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

blobfuse: 1.0.2 -> 1.3.7, separately build cpplite #122976

Merged
merged 1 commit into from
May 19, 2021
Merged

blobfuse: 1.0.2 -> 1.3.7, separately build cpplite #122976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 21 additions & 8 deletions pkgs/tools/filesystems/blobfuse/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,32 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, curl, gnutls, libgcrypt, libuuid, fuse }:

stdenv.mkDerivation rec {
pname = "blobfuse";
version = "1.0.2";
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, curl, gnutls, libgcrypt, libuuid, fuse, boost }:

let
version = "1.3.7";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-fuse";
rev = "v${version}";
sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp";
rev = "blobfuse-${version}-Linux";
sha256 = "sha256-yihIuS4AG489U7eBi/p7H6S7Cg54kkQeNVCexxQZ60A=";
};
cpplite = stdenv.mkDerivation rec {
pname = "cpplite";
inherit version src;

sourceRoot = "source/cpplite";
patches = [ ./install-adls.patch ];

cmakeFlags = [ "-DBUILD_ADLS=ON" "-DUSE_OPENSSL=OFF" ];

buildInputs = [ curl libuuid gnutls ];
nativeBuildInputs = [ cmake pkg-config ];
};
in stdenv.mkDerivation rec {
pname = "blobfuse";
inherit version src;

NIX_CFLAGS_COMPILE = "-Wno-error=catch-value";

buildInputs = [ curl gnutls libgcrypt libuuid fuse ];
buildInputs = [ curl gnutls libgcrypt libuuid fuse boost cpplite ];
nativeBuildInputs = [ cmake pkg-config ];

meta = with lib; {
Expand Down
14 changes: 14 additions & 0 deletions pkgs/tools/filesystems/blobfuse/install-adls.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/adls/CMakeLists.txt b/adls/CMakeLists.txt
index 1fb7146..22e663a 100644
--- a/adls/CMakeLists.txt
+++ b/adls/CMakeLists.txt
@@ -50,3 +50,9 @@ if(BUILD_TESTS)
string(REGEX REPLACE "([^;]+)" "${CMAKE_CURRENT_SOURCE_DIR}/\\1" AZURE_STORAGE_ADLS_TEST_SOURCES "${AZURE_STORAGE_ADLS_TEST_SOURCES}")
set(AZURE_STORAGE_ADLS_TEST_SOURCES ${AZURE_STORAGE_ADLS_TEST_SOURCES} PARENT_SCOPE)
endif()
+
+install(TARGETS azure-storage-adls
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib
+ RUNTIME DESTINATION bin)
+