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

fixup! nix: overhaul build system.

Browse Source 
Signed-off-by: Daniel Hill <daniel@gluo.nz>
This commit is contained in:
Daniel Hill 2023-01-03 21:38:11 +13:00
parent 8accfdc3c5
commit 3c39b422ac
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base.nix
View File

@ -1,5 +1,4 @@
{ lib { lib
, doCheck ? true
, stdenvNoCC , stdenvNoCC
, callPackage , callPackage
, nixosTests , nixosTests
@ -7,11 +6,7 @@
, binary , binary
, mount , mount
, versionString ? "0.1" , versionString ? "0.1"
, inShell ? false }:
, debugMode ? inShell
, testWithValgrind ? true
, fuseSupport ? false
, fuse3 ? null }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
pname = "bcachefs-tools"; pname = "bcachefs-tools";
@ -43,7 +38,6 @@ stdenvNoCC.mkDerivation {
ln -s "$out/bin/bcachefs-mount" "$out/bin/mount.bcachefs" ln -s "$out/bin/bcachefs-mount" "$out/bin/mount.bcachefs"
ln -s "$out/bin" "$out/sbin" ln -s "$out/bin" "$out/sbin"
''; '';
doCheck = doCheck; # needs bcachefs module loaded on builder
passthru = { passthru = {
tests = { tests = {

5
flake.nix
View File

@ -13,11 +13,12 @@
utils.lib.eachDefaultSystem (system: utils.lib.eachDefaultSystem (system:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
binary = pkgs.callPackage ./binary.nix { }; binary = pkgs.callPackage ./binary.nix {
testWithValgrind = false;
};
mount = pkgs.callPackage ./rust-src/mount/default.nix { inherit binary; }; mount = pkgs.callPackage ./rust-src/mount/default.nix { inherit binary; };
bcachefs = pkgs.callPackage ./base.nix { bcachefs = pkgs.callPackage ./base.nix {
inherit binary mount; inherit binary mount;
testWithValgrind = false;
}; };
in { in {
packages = { packages = {