nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 18:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs-tools: Fix cross

Browse Source 
The substitute would be good to transfer upstream but I don't know of a
way to do it in the makefile

(cherry picked from commit 4b0b8ae5c3)
This commit is contained in:
Artturin 2024-06-25 22:35:48 +03:00 committed by John Titor
parent d99222e20d
commit fed55ae595
No known key found for this signature in database
GPG Key ID: 29B0514F4E3C1CC0
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/by-name/bc/bcachefs-tools/package.nix
View File

@ -21,6 +21,7 @@
makeWrapper,
nix-update-script,
python3,
fetchpatch,
fuseSupport ? false,
}:
@ -71,6 +72,11 @@ stdenv.mkDerivation (finalAttrs: {
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
] ++ lib.optional fuseSupport "BCACHEFS_FUSE=1";
env = {
CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
"CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc";
};
# FIXME: Try enabling this once the default linux kernel is at least 6.7
doCheck = false; # needs bcachefs module loaded on builder
@ -78,8 +84,19 @@ stdenv.mkDerivation (finalAttrs: {
# code refactoring of bcachefs-tools broke reading passphrases from stdin (vs. terminal)
# upstream issue https://github.com/koverstreet/bcachefs-tools/issues/261
./fix-encrypted-boot.patch
# https://github.com/koverstreet/bcachefs-tools/pull/305
(fetchpatch {
name = "use-ar-var-in-makefile.patch";
url = "https://github.com/koverstreet/bcachefs-tools/commit/91e67ab2bd48fa135a1f5109b23899a4f1019a03.patch";
sha256 = "sha256-nB4Tgcwa8eeasIDQ4rrYORie/X8LMuCSRi+WJNw+R/U=";
})
];
postPatch = ''
substituteInPlace Makefile \
--replace-fail "target/release/bcachefs" "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/bcachefs"
'';
preCheck = lib.optionalString (!fuseSupport) ''
rm tests/test_fuse.py
'';