gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cryfs: 0.11.4 -> 1.0.1

Browse Source 
Fixes build with cmake 4
This commit is contained in:
K900
2025-09-12 16:46:13 +03:00
committed by Emily
parent 493eebd470
commit 967f74d00b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/by-name/cr/cryfs/package.nix
View File

@@ -8,23 +8,22 @@
boost, boost,
curl, curl,
fuse, fuse,
gtest,
openssl, openssl,
range-v3, range-v3,
spdlog, spdlog,
# cryptopp and gtest on standby - using the vendored ones for now
# see https://github.com/cryfs/cryfs/issues/369
llvmPackages, llvmPackages,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cryfs"; pname = "cryfs";
version = "0.11.4"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cryfs"; owner = "cryfs";
repo = "cryfs"; repo = "cryfs";
rev = version; rev = version;
hash = "sha256-OkJhLg+YzS3kDhlpUQe9A+OiVBPG/iKs6OU7aKFJ5wY="; hash = "sha256-QzxJUh6nD6243x443b0tIb1v2Zs8jRUk8IVarNqs47M=";
}; };
postPatch = '' postPatch = ''
@@ -59,20 +58,19 @@ stdenv.mkDerivation rec {
boost boost
curl curl
fuse fuse
gtest
openssl openssl
range-v3 range-v3
spdlog spdlog
] ]
++ lib.optional stdenv.cc.isClang llvmPackages.openmp; ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
#nativeCheckInputs = [ gtest ];
cmakeFlags = [ cmakeFlags = [
"-DDEPENDENCY_CONFIG='../cmake-utils/DependenciesFromLocalSystem.cmake'" "-DDEPENDENCY_CONFIG='../cmake-utils/DependenciesFromLocalSystem.cmake'"
"-DCRYFS_UPDATE_CHECKS:BOOL=FALSE" "-DCRYFS_UPDATE_CHECKS:BOOL=FALSE"
"-DBoost_USE_STATIC_LIBS:BOOL=FALSE" # this option is case sensitive "-DBoost_USE_STATIC_LIBS:BOOL=FALSE" # this option is case sensitive
"-DBUILD_TESTING:BOOL=${if doCheck then "TRUE" else "FALSE"}" "-DBUILD_TESTING:BOOL=${if doCheck then "TRUE" else "FALSE"}"
]; # ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"; ];
# macFUSE needs to be installed for the test to succeed on Darwin # macFUSE needs to be installed for the test to succeed on Darwin
doCheck = !stdenv.hostPlatform.isDarwin; doCheck = !stdenv.hostPlatform.isDarwin;