Nix: proper with tests

Author: fufexan

nix/default.nix

@@ -40,7 +40,7 @@
   xorg,
   xwayland,
   debug ? false,
-  doCheck ? false,
+  withTests ? false,
   enableXWayland ? true,
   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
   wrapRuntimeDeps ? true,
@@ -76,7 +76,7 @@ in
   assert assertMsg (!withHyprtester) "The option `withHyprtester` has been removed. Hyprtester is always built now.";
     customStdenv.mkDerivation (finalAttrs: {
       pname = "hyprland${optionalString debug "-debug"}";
-      inherit version doCheck;
+      inherit version withTests;
 
       src = fs.toSource {
         root = ../.;
@@ -89,7 +89,6 @@ in
             ../assets/install
             ../hyprctl
             ../hyprland.pc.in
-            ../hyprtester
             ../LICENSE
             ../protocols
             ../src
@@ -99,7 +98,7 @@ in
             (fs.fileFilter (file: file.hasExt "conf" || file.hasExt "desktop") ../example)
             (fs.fileFilter (file: file.hasExt "sh") ../scripts)
             (fs.fileFilter (file: file.name == "CMakeLists.txt") ../.)
-            (optional doCheck ../tests)
+            (optional withTests [../tests ../hyprtester])
           ]));
       };
 
@@ -196,7 +195,7 @@ in
         "NO_UWSM" = true;
         "NO_HYPRPM" = true;
         "TRACY_ENABLE" = false;
-        "BUILD_HYPRTESTER" = true;
+        "WITH_TESTS" = withTests;
       };
 
       preConfigure = ''
@@ -216,8 +215,11 @@ in
           ]}
         ''}
 
-        install hyprtester/pointer-warp -t $out/bin
-        install hyprtester/pointer-scroll -t $out/bin
+        ${optionalString withTests ''
+          install hyprtester/pointer-warp -t $out/bin
+          install hyprtester/pointer-scroll -t $out/bin
+          install hyprland_gtests -t $out/bin
+        ''}
       '';
 
       passthru.providedSessions = ["hyprland"];

nix/overlays.nix

@@ -43,7 +43,7 @@ in {
       };
       hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;};
 
-      hyprland-with-tests = final.hyprland.override {doCheck = true;};
+      hyprland-with-tests = final.hyprland.override {withTests = true;};
 
       hyprland-with-hyprtester =
         builtins.trace ''