diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-12 13:00:51 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-12 13:00:51 +0100 |
commit | f52039feb89c3414b27036a4ea0554d72d5a2d01 (patch) | |
tree | 9c3f5d7d3bf2414084b840e48603732280e37d52 /tools | |
parent | 08ca71ccd37191b82ababada3f39d2b56940d114 (diff) | |
download | spectrum-f52039feb89c3414b27036a4ea0554d72d5a2d01.tar spectrum-f52039feb89c3414b27036a4ea0554d72d5a2d01.tar.gz spectrum-f52039feb89c3414b27036a4ea0554d72d5a2d01.tar.bz2 spectrum-f52039feb89c3414b27036a4ea0554d72d5a2d01.tar.lz spectrum-f52039feb89c3414b27036a4ea0554d72d5a2d01.tar.xz spectrum-f52039feb89c3414b27036a4ea0554d72d5a2d01.tar.zst spectrum-f52039feb89c3414b27036a4ea0554d72d5a2d01.zip |
tools/lseek: use finalPackage
No need for manually calling lib.fix when this is built in to mkDerivation. I should have checked for other occurrences of lib.fix in 5e1c84a ("host/start-vm: use finalPackage"), but I didn't think to. This was the only remaining occurrence. Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/lseek/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/tools/lseek/default.nix b/tools/lseek/default.nix index 735decd..8c9c7a1 100644 --- a/tools/lseek/default.nix +++ b/tools/lseek/default.nix @@ -5,7 +5,7 @@ import ../../lib/eval-config.nix ({ config, src, ... }: config.pkgs.pkgsStatic.c { lib, stdenv, clang-tools }: -lib.fix (self: stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { name = "lseek"; inherit src; @@ -16,15 +16,18 @@ lib.fix (self: stdenv.mkDerivation { enableParallelBuilding = true; passthru.tests = { - clang-tidy = self.overrideAttrs ({ nativeBuildInputs ? [], ... }: { - nativeBuildInputs = nativeBuildInputs ++ [ clang-tools ]; - - buildPhase = '' - clang-tidy --warnings-as-errors='*' lseek.c -- - touch $out - exit 0 - ''; - }); + clang-tidy = finalAttrs.finalPackage.overrideAttrs ( + { nativeBuildInputs ? [], ... }: + { + nativeBuildInputs = nativeBuildInputs ++ [ clang-tools ]; + + buildPhase = '' + clang-tidy --warnings-as-errors='*' lseek.c -- + touch $out + exit 0 + ''; + } + ); }; meta = with lib; { |