diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-12-05 18:59:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-05 18:59:02 +0100 |
| commit | 4c37153a2cd7fa736fddbfc310804d71b220f81f (patch) | |
| tree | a27a47b940369fa23e63db9f30d46fc56f2ba1a5 /pkgs/tools | |
| parent | b3caa5f50a90a069b1f9596b48be6cb95d94171b (diff) | |
| parent | ad5e744714640aad36eda89e6b6026c397b4ace5 (diff) | |
| download | nixlib-4c37153a2cd7fa736fddbfc310804d71b220f81f.tar nixlib-4c37153a2cd7fa736fddbfc310804d71b220f81f.tar.gz nixlib-4c37153a2cd7fa736fddbfc310804d71b220f81f.tar.bz2 nixlib-4c37153a2cd7fa736fddbfc310804d71b220f81f.tar.lz nixlib-4c37153a2cd7fa736fddbfc310804d71b220f81f.tar.xz nixlib-4c37153a2cd7fa736fddbfc310804d71b220f81f.tar.zst nixlib-4c37153a2cd7fa736fddbfc310804d71b220f81f.zip | |
Merge pull request #271241 from pbsds/finalattrs-docheck
treewide: finalAttrs.doCheck -> finalAttrs.finalPackage.doCheck
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/mangohud/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index e42ca26cfb08..5dc243ec2d7e 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { # Unpack subproject sources postUnpack = ''( cd "$sourceRoot/subprojects" - ${lib.optionalString finalAttrs.doCheck '' + ${lib.optionalString finalAttrs.finalPackage.doCheck '' cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka ''} cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} @@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dwith_wayland=enabled" "-Duse_system_spdlog=enabled" - "-Dtests=${if finalAttrs.doCheck then "enabled" else "disabled"}" + "-Dtests=${if finalAttrs.finalPackage.doCheck then "enabled" else "disabled"}" ] ++ lib.optionals gamescopeSupport [ "-Dmangoapp=true" "-Dmangoapp_layer=true" @@ -215,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: { addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so" '' + lib.optionalString gamescopeSupport '' addOpenGLRunpath "$out/bin/mangoapp" - '' + lib.optionalString finalAttrs.doCheck '' + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' # libcmocka.so is only used for tests rm "$out/lib/libcmocka.so" ''; |