alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-22 00:00:03 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

nix: overhaul build system.

Browse Source 
Removed outdated overlay.
Simply build tooling using bingenHook and propagated*Inputs

Signed-off-by: Daniel Hill <daniel@gluo.nz>
This commit is contained in:
Daniel Hill 2022-11-25 12:47:29 +13:00
parent 9d6040c8b6
commit 9a44c6d4d0
17 changed files with 303 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.editorconfig Normal file
View File

@ -0,0 +1,6 @@
indent_style = tab
indent_size = 8
[*.nix]
indent_style = space
indent_size = 2

5
.gitignore vendored
View File

@ -3,18 +3,23 @@ bcachefs
bcachefs.5 bcachefs.5
.* .*
*.o *.o
*.so
*.d *.d
*.a *.a
/rust-src/mount/result
/rust-src/bch_bindgen/result
tags tags
TAGS TAGS
cscope* cscope*
bcachefs-tools bcachefs-tools
compile_commands.json
tests/test_helper tests/test_helper
tests/__pycache__/ tests/__pycache__/
# dot-files that we don't want to ignore # dot-files that we don't want to ignore
!.gitignore !.gitignore
!.travis.yml !.travis.yml
!.editorconfig
mount/target mount/target
mount.bcachefs mount.bcachefs

65
base.nix Normal file
View File

@ -0,0 +1,65 @@
{ lib
, doCheck ? true
, stdenvNoCC
, callPackage
, nixosTests
, autoPatchelfHook
, binary
, mount
, versionString ? "0.1"
, inShell ? false
, debugMode ? inShell
, testWithValgrind ? true
, fuseSupport ? false
, fuse3 ? null }:
stdenvNoCC.mkDerivation {
pname = "bcachefs-tools";
version = "v0.1-flake-${versionString}";
nativeBuildInputs = [
binary
mount
];
buildInputs = mount.propagatedBuildInputs;
phases = [ "installPhase" ];
installPhase = ''
mkdir $out
mkdir $out/bin
mkdir $out/lib
mkdir $out/share
mkdir $out/etc
cp -pr "${binary}/bin/"* $out/bin
cp -pr "${binary}/lib/"* $out/lib
cp -pr "${binary}/share/"* $out/share
cp -pr "${binary}/etc/"* $out/etc
cp -pr "${mount}/bin/"* $out/bin/
chmod u+w $out/bin/*
patchelf --add-rpath $out/lib $out/bin/bcachefs-mount
ln -s "$out/bin/bcachefs-mount" "$out/bin/mount.bcachefs"
ln -s "$out/bin" "$out/sbin"
'';
doCheck = doCheck; # needs bcachefs module loaded on builder
passthru = {
tests = {
smoke-test = nixosTests.bcachefs;
};
};
enableParallelBuilding = true;
meta = with lib; {
description = "Userspace tools for bcachefs";
homepage = http://bcachefs.org;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers =
[ "Kent Overstreet <kent.overstreet@gmail.com>"
];
};
}

129
binary.nix Normal file
View File

@ -0,0 +1,129 @@
{ lib
, stdenv
, pkg-config
, attr
, libuuid
, libsodium
, keyutils
, liburcu
, zlib
, libaio
, udev
, zstd
, lz4
, python39
, python39Packages
, docutils
, nixosTests
, versionString ? "0.1"
, doCheck ? true
, inShell ? false
, debugMode ? inShell
, testWithValgrind ? true
, valgrind
, fuseSupport ? false
, fuse3 ? null }:
assert fuseSupport -> fuse3 != null;
assert testWithValgrind -> valgrind != null;
stdenv.mkDerivation {
pname = "bcachefs-bin";
version = "v0.1-flake-${versionString}";
VERSION = "v0.1-flake-${versionString}";
src = (lib.cleanSource (builtins.path { name = "bcachefs-tools-src"; path = ./. ;} ));
postPatch = "patchShebangs --build doc/macro2rst.py";
propagatedNativeBuildInputs = [
# used to find dependencies
## see ./INSTALL
pkg-config
];
propagatedBuildInputs = [
# bcachefs explicit dependencies
## see ./INSTALL
libaio
# libblkid
keyutils # libkeyutils
lz4 # liblz4
libsodium
liburcu
libuuid
zstd # libzstd
zlib # zlib1g
# unspecified dependencies
attr
udev
];
buildInputs = [
# documentation depenedencies
docutils
python39Packages.pygments
] ++ (lib.optional fuseSupport fuse3)
++ (lib.optional testWithValgrind valgrind);
makeFlags = [
"PREFIX=${placeholder "out"}"
] ++ lib.optional debugMode "EXTRA_CFLAGS=-ggdb";
installFlags = [
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
];
doCheck = doCheck; # needs bcachefs module loaded on builder
checkInputs = [
python39Packages.pytest
python39Packages.pytest-xdist
] ++ lib.optional testWithValgrind valgrind;
checkFlags = [
"BCACHEFS_TEST_USE_VALGRIND=${if testWithValgrind then "yes" else "no"}"
# cannot escape spaces within make flags, quotes are stripped
"PYTEST_CMD=pytest" # "PYTEST_ARGS='-n4 --version'"
];
preCheck =
''
makeFlagsArray+=(PYTEST_ARGS="--verbose -n2")
'' +
lib.optionalString fuseSupport ''
rm tests/test_fuse.py
'';
dontStrip = debugMode;
passthru = {
bcachefs_revision = let
file = builtins.readFile ./.bcachefs_revision;
removeLineFeeds = str: lib.lists.foldr (lib.strings.removeSuffix) str ["\r" "\n"];
in removeLineFeeds file;
tests = {
smoke-test = nixosTests.bcachefs;
};
};
enableParallelBuilding = true;
meta = with lib; {
description = "Userspace tools for bcachefs";
homepage = http://bcachefs.org;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers =
[ "Kent Overstreet <kent.overstreet@gmail.com>"
];
};
}

138
default.nix
View File

@ -1,128 +1,10 @@
{ lib (import
, doCheck ? true (
, stdenv let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
, pkg-config fetchTarball {
, attr url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
, libuuid sha256 = lock.nodes.flake-compat.locked.narHash;
, libsodium }
, keyutils )
{ src = ./.; }
, liburcu ).defaultNix
, zlib
, libaio
, udev
, zstd
, lz4
, python39
, python39Packages
, docutils
, nixosTests
, versionString ? "0.1"
, inShell ? false
, debugMode ? inShell
, testWithValgrind ? true
, valgrind
, fuseSupport ? false
, fuse3 ? null }:
assert fuseSupport -> fuse3 != null;
assert testWithValgrind -> valgrind != null;
stdenv.mkDerivation {
pname = "bcachefs-tools";
version = "v0.1-flake-${versionString}";
VERSION = "v0.1-flake-${versionString}";
src = (lib.cleanSource (builtins.path { name = "bcachefs-tools-src"; path = ./. ;} ));
postPatch = "patchShebangs --build doc/macro2rst.py";
nativeBuildInputs = [
# used to find dependencies
## see ./INSTALL
pkg-config
];
buildInputs = [
# bcachefs explicit dependencies
## see ./INSTALL
libaio
# libblkid
keyutils # libkeyutils
lz4 # liblz4
libsodium
liburcu
libuuid
zstd # libzstd
zlib # zlib1g
valgrind
# unspecified dependencies
attr
udev
# documentation depenedencies
docutils
python39Packages.pygments
] ++ (lib.optional fuseSupport fuse3)
++ (lib.optional testWithValgrind valgrind) ;
makeFlags = [
"PREFIX=${placeholder "out"}"
] ++ lib.optional debugMode "EXTRA_CFLAGS=-ggdb";
installFlags = [
"INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
];
doCheck = doCheck; # needs bcachefs module loaded on builder
checkInputs = [
python39Packages.pytest
python39Packages.pytest-xdist
] ++ lib.optional testWithValgrind valgrind;
checkFlags = [
"BCACHEFS_TEST_USE_VALGRIND=${if testWithValgrind then "yes" else "no"}"
# cannot escape spaces within make flags, quotes are stripped
"PYTEST_CMD=pytest" # "PYTEST_ARGS='-n4 --version'"
];
preCheck =
''
makeFlagsArray+=(PYTEST_ARGS="--verbose -n2")
'' +
lib.optionalString fuseSupport ''
rm tests/test_fuse.py
'';
dontStrip = debugMode;
passthru = {
bcachefs_revision = let
file = builtins.readFile ./.bcachefs_revision;
removeLineFeeds = str: lib.lists.foldr (lib.strings.removeSuffix) str ["\r" "\n"];
in removeLineFeeds file;
tests = {
smoke-test = nixosTests.bcachefs;
};
};
enableParallelBuilding = true;
meta = with lib; {
description = "Userspace tools for bcachefs";
homepage = http://bcachefs.org;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers =
[ "Kent Overstreet <kent.overstreet@gmail.com>"
];
};
}

31
flake.lock
View File

@ -1,27 +1,28 @@
{ {
"nodes": { "nodes": {
"filter": { "flake-compat": {
"flake": false,
"locked": { "locked": {
"lastModified": 1620202920, "lastModified": 1668681692,
"narHash": "sha256-BOkm3eKT45Dk4NNxJT0xL9NnyYeZcF+t79zPnJkggac=", "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "numtide", "owner": "edolstra",
"repo": "nix-filter", "repo": "flake-compat",
"rev": "3c9e33ed627e009428197b07216613206f06ed80", "rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "edolstra",
"repo": "nix-filter", "repo": "flake-compat",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1633351077, "lastModified": 1669320964,
"narHash": "sha256-z38JG4Bb0GtM1aF1pANVdp1dniMP23Yb3HnRoJRy2uU=", "narHash": "sha256-EBFw+ge12Pcr3qCk8If3/eMBAoQLR7ytndXZoRevUtM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "14aef06d9b3ad1d07626bdbb16083b83f92dc6c1", "rev": "27ccd29078f974ddbdd7edc8e38c8c8ae003c877",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,18 +34,18 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"filter": "filter", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"utils": "utils" "utils": "utils"
} }
}, },
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1629481132, "lastModified": 1667395993,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "997f7efcb746a9c140ce1f13c72263189225f482", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {

116
flake.nix
View File

@ -1,96 +1,28 @@
{ {
description = "Userspace tools for bcachefs"; description = "Userspace tools for bcachefs";
# Nixpkgs / NixOS version to use. # Nixpkgs / NixOS version to use.
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
inputs.utils.url = "github:numtide/flake-utils"; inputs.utils.url = "github:numtide/flake-utils";
inputs.filter.url = "github:numtide/nix-filter"; inputs.flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};
outputs = { self, nixpkgs, utils, filter, ... }@inputs: outputs = { self, nixpkgs, utils, ... }:
let utils.lib.eachDefaultSystem (system:
# System types to support. let
supportedSystems = [ "x86_64-linux" ]; pkgs = nixpkgs.legacyPackages.${system};
in binary = pkgs.callPackage ./binary.nix { };
{ mount = pkgs.callPackage ./rust-src/mount/default.nix { inherit binary; };
version = "${builtins.substring 0 8 self.lastModifiedDate}-${self.shortRev or "dirty"}"; bcachefs = pkgs.callPackage ./base.nix {
inherit binary mount;
overlay = import ./nix/overlay.nix inputs; testWithValgrind = false;
nixosModule = self.nixosModules.bcachefs; };
nixosModules.bcachefs = import ./rust-src/mount/module.nix; in {
nixosModules.bcachefs-enable-boot = ({config, pkgs, lib, ... }:{ packages = {
# Disable Upstream NixOS Module when this is in use inherit binary mount;
disabledModules = [ "tasks/filesystems/bcachefs.nix" ]; default = bcachefs;
# Import needed packages };
nixpkgs.overlays = [ self.overlay ]; });
# Add bcachefs to boot and kernel
boot.initrd.supportedFilesystems = [ "bcachefs" ];
boot.supportedFilesystems = [ "bcachefs" ];
});
nixosConfigurations.netboot-bcachefs = self.systems.netboot-bcachefs "x86_64-linux";
systems.netboot-bcachefs = system: (nixpkgs.lib.nixosSystem {
inherit system; modules = [
self.nixosModule
self.nixosModules.bcachefs-enable-boot
("${nixpkgs}/nixos/modules/installer/netboot/netboot-minimal.nix")
({ lib, pkgs, config, ... }: {
# installation disk autologin
services.getty.autologinUser = lib.mkForce "root";
users.users.root.initialPassword = "toor";
# Symlink everything together
system.build.netboot = pkgs.symlinkJoin {
name = "netboot";
paths = with config.system.build; [
netbootRamdisk
kernel
netbootIpxeScript
];
preferLocalBuild = true;
};
})
];
});
}
// utils.lib.eachSystem supportedSystems (system:
let pkgs = import nixpkgs {
inherit system;
overlays = [ self.overlay ];
};
in rec {
# A Nixpkgs overlay.
# Provide some binary packages for selected system types.
defaultPackage = pkgs.bcachefs.tools;
packages = {
inherit (pkgs.bcachefs)
tools
toolsValgrind
toolsDebug
mount
bch_bindgen
kernel;
tools-musl = pkgs.pkgsMusl.bcachefs.tools;
mount-musl = pkgs.pkgsMusl.bcachefs.mount;
};
checks = {
kernelSrc = packages.kernel.src;
inherit (packages)
mount
bch_bindgen
toolsValgrind;
# Build and test initrd with bcachefs and bcachefs.mount installed
# Disabled Test because it takes a while to build the kernel
# bootStage1Module = self.nixosConfigurations.netboot-bcachefs.config.system.build.bootStage1;
};
devShell = devShells.tools;
devShells.tools = pkgs.bcachefs.tools.override { inShell = true; };
devShells.mount = pkgs.bcachefs.mount.override { inShell = true; };
});
} }

34
nix/bcachefs-kernel.nix
View File

@ -1,34 +0,0 @@
{ lib
, fetchpatch
, fetchgit
, fetchFromGitHub
, buildLinux
, commit
, sha256 ? lib.fakeSha256
, kernelVersion ? "5.13.0"
, kernelPatches ? [] # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
, argsOverride ? {}
, versionString ? (builtins.substring 0 8 commit)
, ...
} @ args:
buildLinux {
inherit kernelPatches;
# pname = "linux";
version = "${kernelVersion}-bcachefs-${versionString}";
modDirVersion = kernelVersion;
src = fetchFromGitHub {
name = "bcachefs-kernel-src";
owner = "koverstreet";
repo = "bcachefs";
rev = commit;
inherit sha256;
};
extraConfig = "BCACHEFS_FS m";
# NIX_DEBUG=5;
}

1
nix/bcachefs.rev.sha256
View File

@ -1 +0,0 @@
sha256-JsWrbuxrs047YKGES+r7mMfPdDWIMAGrg1fWi8qU4+A=

48
nix/fetchnix.nix
View File

@ -1,48 +0,0 @@
# `builtins.fetchTarball` only accepts a `sha256` argument in Nix version 1.12
# or later, so here we provide a function that can provide a compatible interface
# to Nix 1.11 or Nix 1.12
#
# TODO FIXME: remove this sometime after Nix 1.12 goes stable
{ url # URL of the nixpkgs tarball to download
, rev # The Git revision of nixpkgs to fetch
, sha256 # The SHA256 of the downloaded data
, system ? builtins.currentSystem # This is overridable if necessary
}:
with {
ifThenElse = { bool, thenValue, elseValue }: (
if bool then thenValue else elseValue);
};
ifThenElse {
bool = (0 <= builtins.compareVersions builtins.nixVersion "1.12");
# In Nix 1.12, we can just give a `sha256` to `builtins.fetchTarball`.
thenValue = (builtins.fetchTarball { inherit url sha256; });
# This hack should at least work for Nix 1.11
elseValue = (
(rec {
tarball = import <nix/fetchurl.nix> { inherit url sha256; };
builtin-paths = import <nix/config.nix>;
script = builtins.toFile "nixpkgs-unpacker" ''
"$coreutils/mkdir" "$out"
cd "$out"
"$gzip" --decompress < "$tarball" | "$tar" -x --strip-components=1
'';
nixpkgs = builtins.derivation {
name = "nixpkgs-${builtins.substring 0 6 rev}";
builder = builtins.storePath builtin-paths.shell;
args = [ script ];
inherit tarball system;
tar = builtins.storePath builtin-paths.tar;
gzip = builtins.storePath builtin-paths.gzip;
coreutils = builtins.storePath builtin-paths.coreutils;
};
}).nixpkgs);
}

5
nix/nixpkgs.json
View File

@ -1,5 +0,0 @@
{
"url": "https://github.com/nixos/nixpkgs/archive/5ae883b8c3b04e0c4a9c92a5ab3c7c84b9942943.tar.gz",
"rev": "5ae883b8c3b04e0c4a9c92a5ab3c7c84b9942943",
"sha256": "1s2nhax586v2fax7r5qd1s3d2gdg25isva7k7r9pf9x9ay630cmb"
}

9
nix/nixpkgs.nix
View File

@ -1,9 +0,0 @@
let
# Grab the versions we specified in the JSON file
nixpkgs = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
# Bootstrap a copy of nixpkgs, based on this.
src = import ./fetchnix.nix { inherit (nixpkgs) url rev sha256; };
# We use the default nixpkgs configuration during bootstrap.
in import src { config = {}; }

28
nix/overlay.nix
View File

@ -1,28 +0,0 @@
{ filter, self, ... }:
final: prev: {
bcachefs = {
tools = final.callPackage ../default.nix {
testWithValgrind = false;
filter = filter.lib;
versionString = self.version;
};
toolsValgrind = final.bcachefs.tools.override {
testWithValgrind = true;
};
toolsDebug = final.bcachefs.toolsValgrind.override {
debugMode = true;
};
bch_bindgen = final.callPackage ../rust-src/bch_bindgen {};
mount = final.callPackage ../rust-src/mount {};
kernelPackages = final.recurseIntoAttrs (final.linuxPackagesFor final.bcachefs.kernel);
kernel = final.callPackage ./bcachefs-kernel.nix {
commit = final.bcachefs.tools.bcachefs_revision;
# This needs to be recalculated for every revision change
sha256 = builtins.readFile ./bcachefs.rev.sha256;
kernelPatches = [];
};
};
}

32
nix/update-nixpkgs.sh
View File

@ -1,32 +0,0 @@
#!/usr/bin/env bash
set -e
if [[ "x$1" == "x" ]]; then
echo "Must provide a revision argument"
echo "Usage:"
echo " ./update-nixpkgs.sh <rev>"
echo " ./update-nixpkgs.sh https://github.com/foo/nixpkgs <rev>"
exit 1
fi
if [[ "x$2" == "x" ]]; then
REV="$1"
URL="https://github.com/nixos/nixpkgs"
else
REV="$2"
URL="$1"
fi
DOWNLOAD="$URL/archive/$REV.tar.gz"
echo "Updating to nixpkgs revision $REV from $URL"
SHA256=$(nix-prefetch-url "$DOWNLOAD")
cat > nixpkgs.json <<EOF
{
"url": "$DOWNLOAD",
"rev": "$REV",
"sha256": "$SHA256"
}
EOF
echo "Updated nixpkgs.json"

83
rust-src/bch_bindgen/default.nix
View File

@ -4,73 +4,46 @@
, llvmPackages , llvmPackages
, bcachefs , bcachefs
, pkg-config , pkg-config
, udev , udev
, liburcu , liburcu
, zstd , zstd
, keyutils , keyutils
, libaio , libaio
, lz4 # liblz4
, lz4 # liblz4
, libsodium , libsodium
, libuuid , libuuid
, zlib # zlib1g , zlib # zlib1g
, libscrypt , libscrypt
, rustfmt , rustfmt
, glibc , glibc
, ... , ...
}: let }:
include = { let
glibc = "${glibc.dev}/include"; cargo = lib.trivial.importTOML ./Cargo.toml;
clang = let libc = llvmPackages.libclang; in in
"${libc.lib}/lib/clang/${libc.version}/include"; rustPlatform.buildRustPackage {
urcu = "${liburcu}/include"; pname = cargo.package.name;
zstd = "${zstd.dev}/include"; version = cargo.package.version;
};
cargo = lib.trivial.importTOML ./Cargo.toml;
in rustPlatform.buildRustPackage {
pname = cargo.package.name;
version = cargo.package.version;
src = builtins.path { path = ./.; name = "bch_bindgen"; };
cargoLock = { lockFile = ./Cargo.lock; }; src = builtins.path {
path = ./.;
name = "bch_bindgen";
};
nativeBuildInputs = [ rustfmt pkg-config ]; cargoLock = { lockFile = ./Cargo.lock; };
buildInputs = [
# libaio
keyutils # libkeyutils
lz4 # liblz4
libsodium
liburcu
libuuid
zstd # libzstd
zlib # zlib1g
udev
libscrypt
libaio
];
LIBBCACHEFS_LIB ="${bcachefs.tools}/lib";
LIBBCACHEFS_INCLUDE = bcachefs.tools.src;
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
BINDGEN_EXTRA_CLANG_ARGS = lib.replaceStrings ["\n" "\t"] [" " ""] ''
-std=gnu99
-I${include.glibc}
-I${include.clang}
-I${include.urcu}
-I${include.zstd}
'';
postPatch = '' propagatedNativeBuildInputs = [ rustPlatform.bindgenHook ];
cp ${./Cargo.lock} Cargo.lock
'';
doCheck = true; propagatedBuildInputs = [
bcachefs.tools
# NIX_DEBUG = 4; ];
}
LIBBCACHEFS_LIB ="${bcachefs.tools}/lib";
LIBBCACHEFS_INCLUDE = bcachefs.tools.src;
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
'';
doCheck = true;
}

46
rust-src/mount/default.nix
View File

@ -1,41 +1,27 @@
{ lib { lib
, stdenv , stdenv
, glibc , glibc
, udev
, llvmPackages , llvmPackages
, rustPlatform , rustPlatform
, binary
, bcachefs
, ... , ...
}: rustPlatform.buildRustPackage ( let }: rustPlatform.buildRustPackage ( let
cargo = lib.trivial.importTOML ./Cargo.toml; cargo = lib.trivial.importTOML ./Cargo.toml;
in { in {
pname = "mount.bcachefs"; pname = "mount.bcachefs";
version = cargo.package.version; version = cargo.package.version;
src = builtins.path { path = ../.; name = "rust-src"; };
sourceRoot = "rust-src/mount";
cargoLock = { lockFile = ./Cargo.lock; }; src = builtins.path { path = ../.; name = "rust-src"; };
sourceRoot = "rust-src/mount";
nativeBuildInputs = bcachefs.bch_bindgen.nativeBuildInputs; cargoLock = { lockFile = ./Cargo.lock; };
buildInputs = bcachefs.bch_bindgen.buildInputs;
inherit (bcachefs.bch_bindgen)
LIBBCACHEFS_INCLUDE
LIBBCACHEFS_LIB
LIBCLANG_PATH
BINDGEN_EXTRA_CLANG_ARGS;
postInstall = ''
ln $out/bin/${cargo.package.name} $out/bin/mount.bcachefs
ln -s $out/bin $out/sbin
'';
# -isystem ${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.libclang}/include";
# CFLAGS = "-I${llvmPackages.libclang.lib}/include";
# LDFLAGS = "-L${libcdev}";
doCheck = false; nativeBuildInputs = [ binary rustPlatform.bindgenHook ];
buildInputs = [ binary ];
# NIX_DEBUG = 4;
}) LIBBCACHEFS_LIB ="${binary}/lib";
LIBBCACHEFS_INCLUDE = binary.src;
doCheck = false;
})

5
shell.nix
View File

@ -10,7 +10,10 @@ mkShell {
buildInputs = [ buildInputs = [
linuxKernel.packages.${kversion}.perf linuxKernel.packages.${kversion}.perf
gdb gdb
ccls # code completion in neovim/emacs # lsp code completion in neovim/emacs
clangd
rust-analyzer
rnix-lsp
]; ];
inputsFrom = [ inputsFrom = [
tools tools