From f482d0a9511a88d5018b1d12a6f9e61af37a9f4d Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sun, 14 May 2023 14:22:04 +0200 Subject: [PATCH] flake: Use correct input types for dependencies --- flake.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 21f5e13..78fb25d 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ pkgs = import nixpkgs { inherit system; }; mkNocheck = drv: drv.overrideAttrs (o: { doCheck = false; - nativeBuildInputs = pkgs.lib.filter (p: p != pkgs.catch2_3) o.nativeBuildInputs; + checkInputs = [ ]; }); in { @@ -20,7 +20,8 @@ src = ./u01; - nativeBuildInputs = [ catch2_3 cmake ]; + nativeBuildInputs = [ cmake ]; + checkInputs = [ catch2_3 ]; doCheck = true; }) @@ -32,7 +33,9 @@ src = ./u02; - nativeBuildInputs = [ catch2_3 cmake freeglut libGL libGLU ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ freeglut libGL libGLU ]; + checkInputs = [ catch2_3 ]; doCheck = true; })