diff options
author | Daniel Hill <daniel@gluo.nz> | 2023-01-03 21:38:11 +1300 |
---|---|---|
committer | Daniel Hill <daniel@gluo.nz> | 2023-01-31 12:10:36 +1300 |
commit | 3c39b422acd3346321185be0ce263809e2a9a23f (patch) | |
tree | d670cc2e437fd5729254b234b37f736d1d441ece | |
parent | 8accfdc3c596bfe5cbd10dac3f1650192981eb17 (diff) | |
download | bcachefs-tools-3c39b422acd3346321185be0ce263809e2a9a23f.tar.gz |
fixup! nix: overhaul build system.
Signed-off-by: Daniel Hill <daniel@gluo.nz>
-rw-r--r-- | base.nix | 8 | ||||
-rw-r--r-- | flake.nix | 5 |
2 files changed, 4 insertions, 9 deletions
@@ -1,5 +1,4 @@ { lib -, doCheck ? true , stdenvNoCC , callPackage , nixosTests @@ -7,11 +6,7 @@ , binary , mount , versionString ? "0.1" -, inShell ? false -, debugMode ? inShell -, testWithValgrind ? true -, fuseSupport ? false -, fuse3 ? null }: +}: stdenvNoCC.mkDerivation { pname = "bcachefs-tools"; @@ -43,7 +38,6 @@ stdenvNoCC.mkDerivation { 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 = { @@ -13,11 +13,12 @@ utils.lib.eachDefaultSystem (system: let 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; }; bcachefs = pkgs.callPackage ./base.nix { inherit binary mount; - testWithValgrind = false; }; in { packages = { |