diff options
author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-11-30 18:50:59 +0100 |
---|---|---|
committer | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-11-30 18:56:12 +0100 |
commit | ad5e744714640aad36eda89e6b6026c397b4ace5 (patch) | |
tree | b78d91499ee46f343c32dd5cf851cc015f7f1967 /pkgs/servers/mir/default.nix | |
parent | 9b11307f42bb14d8f3ba50eb8bd80ab7dbbbec9f (diff) |
treewide: finalAttrs.doCheck -> finalAttrs.finalPackage.doCheck
This will respect `doCheck = false;` overrides, common for cross.
Diffstat (limited to 'pkgs/servers/mir/default.nix')
-rw-r--r-- | pkgs/servers/mir/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 078125016bf0e..ed28e3be41818 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config (python3.withPackages (ps: with ps; [ pillow - ] ++ lib.optionals finalAttrs.doCheck [ + ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ pygobject3 python-dbusmock ])) @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DBUILD_DOXYGEN=OFF" "-DMIR_PLATFORM='gbm-kms;x11;eglstream-kms;wayland'" - "-DMIR_ENABLE_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DMIR_ENABLE_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" # BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such # https://github.com/MirServer/mir/pull/1947#issuecomment-811810872 "-DMIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN=ON" |