diff --git a/nix/test-meta.nix b/nix/test-meta.nix index 4f90dc2..c217aac 100644 --- a/nix/test-meta.nix +++ b/nix/test-meta.nix @@ -11,18 +11,10 @@ wayland-scanner, version ? "git", }: let - inherit (lib.lists) flatten foldl'; inherit (lib.sources) cleanSourceWith cleanSource; - inherit (lib.strings) hasSuffix cmakeBool; - - adapters = flatten [ - stdenvAdapters.useMoldLinker - stdenvAdapters.keepDebugInfo - ]; - - customStdenv = foldl' (acc: adapter: adapter acc) stdenv adapters; + inherit (lib.strings) hasSuffix; in - customStdenv.mkDerivation (finalAttrs: { + stdenv.mkDerivation (finalAttrs: { pname = "hyprlock-test-meta"; inherit version; @@ -40,20 +32,14 @@ in hyprwayland-scanner pkg-config wayland-scanner - egl-wayland ]; buildInputs = hyprlock.buildInputs; - cmakeBuildType = "Debug"; - - cmakeFlags = [(cmakeBool "TESTS" true)]; - meta = { homepage = "https://github.com/hyprwm/hyprlock"; description = "Hyprlock testing utility"; license = lib.licenses.bsd3; platforms = hyprlock.meta.platforms; - mainProgram = "wait-for-lock"; }; }) diff --git a/nix/tests/default.nix b/nix/tests/default.nix index 4f33434..fd0c134 100644 --- a/nix/tests/default.nix +++ b/nix/tests/default.nix @@ -98,7 +98,7 @@ in { hyprlock_cmd = f"${lib.getExe' pkgs.apitrace "apitrace"} trace --output {log_file_path}.trace --api egl {hyprlock_cmd}" machine.execute(f"hyprctl --instance 0 dispatch exec '{hyprlock_cmd}'") - wait_for_lock_exit_status, out = machine.execute("WAYLAND_DISPLAY=wayland-1 ${flake.hyprlock-test-meta}/bin/wait-for-lock") + wait_for_lock_exit_status, out = machine.execute("WAYLAND_DISPLAY=wayland-1 ${lib.getExe' flake.hyprlock-test-meta "wait-for-lock"}") print(f"Wait for lock exit code: {wait_for_lock_exit_status}") if wait_for_lock_exit_status != 0: break