From a0d022d0f46c99ebc925ae629ae75e61d6b3dd63 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 18 Jul 2026 18:15:40 +0200 Subject: [PATCH] treewide: use finalAttrs.finalPackage.doCheck --- pkgs/applications/emulators/wibo/default.nix | 2 +- .../networking/instant-messengers/profanity/default.nix | 2 +- pkgs/by-name/ap/apparmor-parser/package.nix | 2 +- pkgs/by-name/ar/ardour/package.nix | 2 +- pkgs/by-name/bi/bitcoin-knots/package.nix | 2 +- pkgs/by-name/bi/bitcoin/package.nix | 2 +- pkgs/by-name/br/brlcad/package.nix | 2 +- pkgs/by-name/cm/cmocka/package.nix | 2 +- pkgs/by-name/el/elements/package.nix | 2 +- pkgs/by-name/fe/feedbackd-device-themes/package.nix | 2 +- pkgs/by-name/fe/fex/package.nix | 2 +- pkgs/by-name/fl/flatpak/package.nix | 2 +- pkgs/by-name/ft/ftxui/package.nix | 2 +- pkgs/by-name/fw/fwup/package.nix | 2 +- pkgs/by-name/gs/gsl-lite/package.nix | 2 +- pkgs/by-name/gz/gz-cmake/package.nix | 4 ++-- pkgs/by-name/in/iniparser/package.nix | 2 +- pkgs/by-name/ja/jasterix/package.nix | 2 +- pkgs/by-name/js/json-tui/package.nix | 2 +- pkgs/by-name/li/libmemcached/package.nix | 2 +- pkgs/by-name/li/libpointmatcher/package.nix | 2 +- pkgs/by-name/li/libvncserver/package.nix | 2 +- pkgs/by-name/li/libxmp/package.nix | 2 +- pkgs/by-name/ma/mathic/package.nix | 2 +- pkgs/by-name/ma/mathicgb/package.nix | 2 +- pkgs/by-name/ma/mayo/package.nix | 2 +- pkgs/by-name/me/memtailor/package.nix | 2 +- pkgs/by-name/mi/mimalloc/package.nix | 2 +- pkgs/by-name/mi/minizip-ng/package.nix | 4 ++-- pkgs/by-name/mo/mosquitto/package.nix | 2 +- pkgs/by-name/mu/mu/package.nix | 2 +- pkgs/by-name/mu/muon/package.nix | 8 ++++---- pkgs/by-name/ne/nexusmods-app/package.nix | 2 +- pkgs/by-name/nl/nlopt/package.nix | 2 +- pkgs/by-name/ns/ns-3/package.nix | 2 +- pkgs/by-name/on/onnx/package.nix | 2 +- pkgs/by-name/on/onnxruntime/package.nix | 2 +- pkgs/by-name/pa/particl-core/package.nix | 2 +- pkgs/by-name/pi/picolibc/package.nix | 2 +- pkgs/by-name/po/pocket-id/package.nix | 2 +- pkgs/by-name/pr/prevail/package.nix | 2 +- pkgs/by-name/ra/radiotray-ng/package.nix | 2 +- pkgs/by-name/so/sobjectizer/package.nix | 2 +- pkgs/by-name/sy/syncthingtray/package.nix | 2 +- pkgs/by-name/tp/tpm2-pkcs11/package.nix | 4 ++-- pkgs/by-name/tt/tt-umd/package.nix | 2 +- pkgs/by-name/wi/wireguard-go/package.nix | 2 +- pkgs/by-name/z3/z3/package.nix | 2 +- pkgs/development/compilers/sbcl/default.nix | 2 +- pkgs/development/cuda-modules/packages/cutlass.nix | 8 ++++---- pkgs/development/ocaml-modules/graphql/cohttp.nix | 2 +- pkgs/development/ocaml-modules/uucp/default.nix | 2 +- .../rocm-modules/rocprof-trace-decoder/default.nix | 2 +- pkgs/os-specific/linux/iputils/default.nix | 2 +- pkgs/tools/system/nvtop/build-nvtop.nix | 2 +- 55 files changed, 64 insertions(+), 64 deletions(-) diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix index f982374e6b73..7a5b0ad8e937 100644 --- a/pkgs/applications/emulators/wibo/default.nix +++ b/pkgs/applications/emulators/wibo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta.license = lib.licenses.unfree; }; in - lib.optionalString finalAttrs.doCheck '' + lib.optionalString finalAttrs.finalPackage.doCheck '' MWCIncludes=../test ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c file test.o | grep "ELF 32-bit" ''; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 008b7b574509..117a95f4e476 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { # see also: https://profanity-im.github.io/guide/latest/build.html#expl mesonFlags = [ - (lib.mesonBool "tests" finalAttrs.doCheck) + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) (lib.mesonEnable "notifications" notifySupport) (lib.mesonEnable "python-plugins" pythonPluginSupport) (lib.mesonEnable "c-plugins" true) diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix index 8844ca83b316..ca7d56dca48f 100644 --- a/pkgs/by-name/ap/apparmor-parser/package.nix +++ b/pkgs/by-name/ap/apparmor-parser/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { "POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}" "MANDIR=share/man" ] - ++ lib.optional finalAttrs.doCheck "PROVE=${lib.getExe' perl "prove"}"; + ++ lib.optional finalAttrs.finalPackage.doCheck "PROVE=${lib.getExe' perl "prove"}"; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/by-name/ar/ardour/package.nix b/pkgs/by-name/ar/ardour/package.nix index e5924ad03e4b..0659af469370 100644 --- a/pkgs/by-name/ar/ardour/package.nix +++ b/pkgs/by-name/ar/ardour/package.nix @@ -193,7 +193,7 @@ let # https://discourse.ardour.org/t/ardour-8-2-released/109615/8 # "--use-external-libs" ] - ++ lib.optional finalAttrs.doCheck "--test" + ++ lib.optional finalAttrs.finalPackage.doCheck "--test" ++ lib.optional optimize "--optimize"; env = { diff --git a/pkgs/by-name/bi/bitcoin-knots/package.nix b/pkgs/by-name/bi/bitcoin-knots/package.nix index ee766f027c6e..1c6a88d022de 100644 --- a/pkgs/by-name/bi/bitcoin-knots/package.nix +++ b/pkgs/by-name/bi/bitcoin-knots/package.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_USDT" enableTracing) (lib.cmakeFeature "RDTS_CONSENT" "RUNTIME_WARN") ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ (lib.cmakeBool "BUILD_TESTS" false) (lib.cmakeBool "BUILD_FUZZ_BINARY" false) (lib.cmakeBool "BUILD_GUI_TESTS" false) diff --git a/pkgs/by-name/bi/bitcoin/package.nix b/pkgs/by-name/bi/bitcoin/package.nix index e84c04887ac6..c7ecbabceeef 100644 --- a/pkgs/by-name/bi/bitcoin/package.nix +++ b/pkgs/by-name/bi/bitcoin/package.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_ZMQ" true) (lib.cmakeBool "WITH_USDT" enableTracing) ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ (lib.cmakeBool "BUILD_TESTS" false) (lib.cmakeBool "BUILD_FUZZ_BINARY" false) (lib.cmakeBool "BUILD_GUI_TESTS" false) diff --git a/pkgs/by-name/br/brlcad/package.nix b/pkgs/by-name/br/brlcad/package.nix index 9629fc86897e..fde53331be81 100644 --- a/pkgs/by-name/br/brlcad/package.nix +++ b/pkgs/by-name/br/brlcad/package.nix @@ -227,7 +227,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BRLCAD_ENABLE_STRICT" false) - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "BRLCAD_ENABLE_QT" enableQt) (lib.cmakeFeature "GTE_INCLUDE_DIR" "${gtmathematics}/include/gtmathematics") (lib.cmakeFeature "LMDB_LIBRARY" "${lmdb.out}/lib/liblmdb${stdenv.hostPlatform.extensions.sharedLibrary}") diff --git a/pkgs/by-name/cm/cmocka/package.nix b/pkgs/by-name/cm/cmocka/package.nix index cae6effbbfbd..f2e4e6a38955 100644 --- a/pkgs/by-name/cm/cmocka/package.nix +++ b/pkgs/by-name/cm/cmocka/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; cmakeFlags = - lib.optional finalAttrs.doCheck "-DUNIT_TESTING=ON" + lib.optional finalAttrs.finalPackage.doCheck "-DUNIT_TESTING=ON" ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; doCheck = true; diff --git a/pkgs/by-name/el/elements/package.nix b/pkgs/by-name/el/elements/package.nix index 2bdac00f7537..6d0385633609 100644 --- a/pkgs/by-name/el/elements/package.nix +++ b/pkgs/by-name/el/elements/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-boost-libdir=${boost.out}/lib" "--disable-bench" ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "--disable-tests" "--disable-gui-tests" ] diff --git a/pkgs/by-name/fe/feedbackd-device-themes/package.nix b/pkgs/by-name/fe/feedbackd-device-themes/package.nix index 78deacafd2a5..02cd3b68cc7b 100644 --- a/pkgs/by-name/fe/feedbackd-device-themes/package.nix +++ b/pkgs/by-name/fe/feedbackd-device-themes/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - (lib.mesonOption "validate" (if finalAttrs.doCheck then "enabled" else "disabled")) + (lib.mesonOption "validate" (if finalAttrs.finalPackage.doCheck then "enabled" else "disabled")) ]; doCheck = true; diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index ea2f4eece6da..0a9c395988f8 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -233,7 +233,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { cmakeFlagsArray+=("-DBUILD_TESTING:BOOL=FALSE") else echo "Keeping checkPhase as-is" - cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck}") + cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck}") fi ''; diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 54f07a4a6c8b..7f909e0960d0 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ # Hardcode paths used by tests and change test runtime generation to use files from Nix store. # https://github.com/flatpak/flatpak/issues/1460 (replaceVars ./fix-test-paths.patch { diff --git a/pkgs/by-name/ft/ftxui/package.nix b/pkgs/by-name/ft/ftxui/package.nix index 70bfe592bc97..cc659187d2f4 100644 --- a/pkgs/by-name/ft/ftxui/package.nix +++ b/pkgs/by-name/ft/ftxui/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "FTXUI_BUILD_EXAMPLES" false) (lib.cmakeBool "FTXUI_BUILD_DOCS" true) - (lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; meta = { diff --git a/pkgs/by-name/fw/fwup/package.nix b/pkgs/by-name/fw/fwup/package.nix index 3ecaa0d8bf8e..3eddac5d52dc 100644 --- a/pkgs/by-name/fw/fwup/package.nix +++ b/pkgs/by-name/fw/fwup/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { unzip zip ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ mtools dosfstools ]; diff --git a/pkgs/by-name/gs/gsl-lite/package.nix b/pkgs/by-name/gs/gsl-lite/package.nix index 7b53ae8762ee..07e497660fd5 100644 --- a/pkgs/by-name/gs/gsl-lite/package.nix +++ b/pkgs/by-name/gs/gsl-lite/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; # Building tests is broken on Darwin. diff --git a/pkgs/by-name/gz/gz-cmake/package.nix b/pkgs/by-name/gz/gz-cmake/package.nix index 34d9fefd9806..40210a44177b 100644 --- a/pkgs/by-name/gz/gz-cmake/package.nix +++ b/pkgs/by-name/gz/gz-cmake/package.nix @@ -45,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: { doBuildExamples = false; cmakeFlags = [ - (lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.doCheck) - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "BUILD_EXAMPLES" finalAttrs.doBuildExamples) ]; diff --git a/pkgs/by-name/in/iniparser/package.nix b/pkgs/by-name/in/iniparser/package.nix index 260dfdf1887f..3d1a5af3a3f4 100644 --- a/pkgs/by-name/in/iniparser/package.nix +++ b/pkgs/by-name/in/iniparser/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-z10S9ODLprd7CbL5Ecgh7H4eOwTetYwFXiWBUm6fIr4="; }; - patches = lib.optional finalAttrs.doCheck ( + patches = lib.optional finalAttrs.finalPackage.doCheck ( # 1. Do not fetch the Unity GitHub repository # 2. Lookup the Unity pkgconfig file # 3. Get the generate_test_runner.rb file from the Unity share directory diff --git a/pkgs/by-name/ja/jasterix/package.nix b/pkgs/by-name/ja/jasterix/package.nix index 9b804aaabd26..2d95eb370e55 100644 --- a/pkgs/by-name/ja/jasterix/package.nix +++ b/pkgs/by-name/ja/jasterix/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic) - (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; buildInputs = [ diff --git a/pkgs/by-name/js/json-tui/package.nix b/pkgs/by-name/js/json-tui/package.nix index 852dba711ead..6dcac51bbb47 100644 --- a/pkgs/by-name/js/json-tui/package.nix +++ b/pkgs/by-name/js/json-tui/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Wno-dev" # suppress cmake warning about deprecated usage - (lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}") ]; diff --git a/pkgs/by-name/li/libmemcached/package.nix b/pkgs/by-name/li/libmemcached/package.nix index 0da1dfeb7ebf..67d989f18483 100644 --- a/pkgs/by-name/li/libmemcached/package.nix +++ b/pkgs/by-name/li/libmemcached/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) "-DENABLE_SASL=ON" ]; diff --git a/pkgs/by-name/li/libpointmatcher/package.nix b/pkgs/by-name/li/libpointmatcher/package.nix index aa099a0cd540..66d2c094807e 100644 --- a/pkgs/by-name/li/libpointmatcher/package.nix +++ b/pkgs/by-name/li/libpointmatcher/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "EIGEN_INCLUDE_DIR" "${eigen}/include/eigen3") - (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; doCheck = true; diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix index 29ce2959e878..1cc1489c93d9 100644 --- a/pkgs/by-name/li/libvncserver/package.nix +++ b/pkgs/by-name/li/libvncserver/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_SYSTEMD" withSystemd) (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) (lib.cmakeBool "WITH_EXAMPLES" buildExamples) - (lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck) ]; # This test checks if using the **installed** headers works. diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix index c170f837e902..327c21205901 100644 --- a/pkgs/by-name/li/libxmp/package.nix +++ b/pkgs/by-name/li/libxmp/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic) - (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/by-name/ma/mathic/package.nix b/pkgs/by-name/ma/mathic/package.nix index fe2330fd28da..9d90e17fa8f5 100644 --- a/pkgs/by-name/ma/mathic/package.nix +++ b/pkgs/by-name/ma/mathic/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; __structuredAttrs = true; diff --git a/pkgs/by-name/ma/mathicgb/package.nix b/pkgs/by-name/ma/mathicgb/package.nix index cf88e8024712..f6cbbdcf9fbd 100644 --- a/pkgs/by-name/ma/mathicgb/package.nix +++ b/pkgs/by-name/ma/mathicgb/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/ma/mayo/package.nix b/pkgs/by-name/ma/mayo/package.nix index 5baaa54006e6..3da00353fe45 100644 --- a/pkgs/by-name/ma/mayo/package.nix +++ b/pkgs/by-name/ma/mayo/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeOptionType "string" "Mayo_VersionMajor" (lib.versions.major finalAttrs.version)) (lib.cmakeOptionType "string" "Mayo_VersionMinor" (lib.versions.minor finalAttrs.version)) (lib.cmakeOptionType "string" "Mayo_VersionPatch" (lib.versions.patch finalAttrs.version)) - (lib.cmakeBool "Mayo_BuildTests" finalAttrs.doCheck) + (lib.cmakeBool "Mayo_BuildTests" finalAttrs.finalPackage.doCheck) ] ++ lib.optional withAssimp "-DMayo_BuildPluginAssimp=ON"; diff --git a/pkgs/by-name/me/memtailor/package.nix b/pkgs/by-name/me/memtailor/package.nix index a70d33ecf38d..ddfb329286af 100644 --- a/pkgs/by-name/me/memtailor/package.nix +++ b/pkgs/by-name/me/memtailor/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/mi/mimalloc/package.nix b/pkgs/by-name/mi/mimalloc/package.nix index ed8ba80d66e5..6f4c2362a33e 100644 --- a/pkgs/by-name/mi/mimalloc/package.nix +++ b/pkgs/by-name/mi/mimalloc/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { MI_SECURE = secureBuild; MI_BUILD_SHARED = stdenv.hostPlatform.hasSharedLibraries; MI_LIBC_MUSL = stdenv.hostPlatform.libc == "musl"; - MI_BUILD_TESTS = finalAttrs.doCheck; + MI_BUILD_TESTS = finalAttrs.finalPackage.doCheck; # MI_OPT_ARCH is inaccurate (e.g. it assumes aarch64 == armv8.1-a). # Nixpkgs's native platform configuration does a better job. diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index d7dd9bee6845..624d7e9b8d43 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "MZ_OPENSSL" true) (lib.cmakeBool "MZ_PPMD" false) # PPMD support requres internet access to make a git clone (lib.cmakeBool "MZ_LIBCOMP" false) # builds only on Darwin by default where it fails due to mising headers - (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.doCheck) - (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "MZ_COMPAT" enableCompat) ] ++ lib.optionals stdenv.hostPlatform.isi686 [ diff --git a/pkgs/by-name/mo/mosquitto/package.nix b/pkgs/by-name/mo/mosquitto/package.nix index b295de57ed23..56621743f089 100644 --- a/pkgs/by-name/mo/mosquitto/package.nix +++ b/pkgs/by-name/mo/mosquitto/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_BUNDLED_DEPS" false) (lib.cmakeBool "WITH_WEBSOCKETS" true) (lib.cmakeBool "WITH_SYSTEMD" withSystemd) - (lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck) ]; postFixup = '' diff --git a/pkgs/by-name/mu/mu/package.nix b/pkgs/by-name/mu/mu/package.nix index f2f59b52606c..0187936e152d 100644 --- a/pkgs/by-name/mu/mu/package.nix +++ b/pkgs/by-name/mu/mu/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.strings.mesonEnable "guile" false) (lib.strings.mesonEnable "scm" false) (lib.strings.mesonEnable "readline" false) - (lib.strings.mesonEnable "tests" finalAttrs.doCheck) + (lib.strings.mesonEnable "tests" finalAttrs.finalPackage.doCheck) (lib.strings.mesonOption "lispdir" "${placeholder "mu4e"}/share/emacs/site-lisp") ]; diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index dd760d4519f4..f20d61af19b8 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals buildDocs [ scdoc ] - ++ lib.optionals (buildDocs || finalAttrs.doCheck) [ + ++ lib.optionals (buildDocs || finalAttrs.finalPackage.doCheck) [ (python3.withPackages (ps: [ ps.pyyaml ])) ]; @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -name "*.py" -exec chmod +x {} \; patchShebangs subprojects '' - + lib.optionalString finalAttrs.doCheck '' + + lib.optionalString finalAttrs.finalPackage.doCheck '' substituteInPlace \ "subprojects/meson-tests/common/14 configure file/test.py.in" \ "subprojects/meson-tests/common/274 customtarget exe for test/generate.py" \ @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { (muonBool "static" stdenv.targetPlatform.isStatic) (muonEnable "man-pages" buildDocs) (muonEnable "meson-docs" buildDocs) - (muonEnable "meson-tests" finalAttrs.doCheck) + (muonEnable "meson-tests" finalAttrs.finalPackage.doCheck) (muonEnable "samurai" embedSamurai) (muonEnable "tracy" false) (muonEnable "website" false) @@ -177,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "muon-build"; rev = "db92588773a24f67cda2f331b945825ca3a63fa7"; hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM="; - passthru.use = finalAttrs.doCheck; + passthru.use = finalAttrs.finalPackage.doCheck; }; }; diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 0f60677bb40c..62f7b4fce9e4 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -70,7 +70,7 @@ buildDotnetModule (finalAttrs: { substituteInPlace src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj \ --replace-fail '$(BaseIntermediateOutputPath)games.json' ${./vendored/games.json} - ${lib.optionalString finalAttrs.doCheck '' + ${lib.optionalString finalAttrs.finalPackage.doCheck '' # For some reason these tests fail (intermittently?) with a zero timestamp touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png ''} diff --git a/pkgs/by-name/nl/nlopt/package.nix b/pkgs/by-name/nl/nlopt/package.nix index e6b9f8cd3a38..753837da46ac 100644 --- a/pkgs/by-name/nl/nlopt/package.nix +++ b/pkgs/by-name/nl/nlopt/package.nix @@ -88,7 +88,7 @@ clangStdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "NLOPT_MATLAB" false) (lib.cmakeBool "NLOPT_GUILE" false) (lib.cmakeBool "NLOPT_LUKSAN" (!withoutLuksanSolvers)) - (lib.cmakeBool "NLOPT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "NLOPT_TESTS" finalAttrs.finalPackage.doCheck) ] ++ lib.optional withPython ( lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}" diff --git a/pkgs/by-name/ns/ns-3/package.nix b/pkgs/by-name/ns/ns-3/package.nix index 39aeb72c4e1d..91bf292685e0 100644 --- a/pkgs/by-name/ns/ns-3/package.nix +++ b/pkgs/by-name/ns/ns-3/package.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { "-DNS3_GTK3=ON" "-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ] - ++ lib.optional finalAttrs.doCheck "-DNS3_TESTS=ON"; + ++ lib.optional finalAttrs.finalPackage.doCheck "-DNS3_TESTS=ON"; # strictoverflow prevents clang from discovering pyembed when bindings hardeningDisable = [ diff --git a/pkgs/by-name/on/onnx/package.nix b/pkgs/by-name/on/onnx/package.nix index 31adc3753a6c..fcab2143a192 100644 --- a/pkgs/by-name/on/onnx/package.nix +++ b/pkgs/by-name/on/onnx/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { # NOTE: Darwin requires a static build; otherwise, tests fail in the Python package. BUILD_SHARED_LIBS = if stdenv.hostPlatform.isDarwin then "0" else "1"; ONNX_BUILD_PYTHON = "1"; - ONNX_BUILD_TESTS = if finalAttrs.doCheck then "1" else "0"; + ONNX_BUILD_TESTS = if finalAttrs.finalPackage.doCheck then "1" else "0"; # ONNX_ML is enabled by default. # See: https://github.com/onnx/onnx/blob/b751946c3d59a3c8358abcc0569b59e6ddb08cdd/CMakeLists.txt#L66-L73 ONNX_ML = "1"; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 01b8ee43df55..e046025f50b0 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -295,7 +295,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { # fails to find protoc on darwin, so specify it (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe buildPackages.protobuf)) (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true) - (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf) (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) (lib.cmakeBool "onnxruntime_USE_NCCL" ncclSupport) diff --git a/pkgs/by-name/pa/particl-core/package.nix b/pkgs/by-name/pa/particl-core/package.nix index d018c782d470..9b9d090995a2 100644 --- a/pkgs/by-name/pa/particl-core/package.nix +++ b/pkgs/by-name/pa/particl-core/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-bench" "--with-boost-libdir=${boost.out}/lib" ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "--enable-tests=no" ]; diff --git a/pkgs/by-name/pi/picolibc/package.nix b/pkgs/by-name/pi/picolibc/package.nix index 0243c1e0f797..aa5aaf9c170d 100644 --- a/pkgs/by-name/pi/picolibc/package.nix +++ b/pkgs/by-name/pi/picolibc/package.nix @@ -185,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: { (mesonBool "want-math-errno" want-math-errno) ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ (mesonBool "tests" true) # Something is broken with this and I'm not sure what. (mesonOption "tests-cdefs" "false") diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 9ddd5193ac3a..e17a1716a78e 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -43,7 +43,7 @@ buildGo127Module (finalAttrs: { ]; # required for TestIsURLPrivate - __darwinAllowLocalNetworking = finalAttrs.doCheck; + __darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck; preFixup = '' mv $out/bin/cmd $out/bin/pocket-id diff --git a/pkgs/by-name/pr/prevail/package.nix b/pkgs/by-name/pr/prevail/package.nix index dc0228506381..7246c9749cb6 100644 --- a/pkgs/by-name/pr/prevail/package.nix +++ b/pkgs/by-name/pr/prevail/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "prevail_ENABLE_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "prevail_ENABLE_TESTS" finalAttrs.finalPackage.doCheck) ]; installPhase = '' diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix index fd13e9e97291..12c9744e29fc 100644 --- a/pkgs/by-name/ra/radiotray-ng/package.nix +++ b/pkgs/by-name/ra/radiotray-ng/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; # 'wxFont::wxFont(int, int, int, int, bool, const wxString&, wxFontEncoding)' is deprecated diff --git a/pkgs/by-name/so/sobjectizer/package.nix b/pkgs/by-name/so/sobjectizer/package.nix index e46c47baafab..965db134ad98 100644 --- a/pkgs/by-name/so/sobjectizer/package.nix +++ b/pkgs/by-name/so/sobjectizer/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SOBJECTIZER_BUILD_STATIC" withStatic) (lib.cmakeBool "SOBJECTIZER_BUILD_SHARED" withShared) (lib.cmakeBool "BUILD_EXAMPLES" (buildExamples && withStatic)) - (lib.cmakeBool "BUILD_TESTS" (finalAttrs.doCheck && withShared)) + (lib.cmakeBool "BUILD_TESTS" (finalAttrs.finalPackage.doCheck && withShared)) ]; # The tests require the shared library thanks to the patch. diff --git a/pkgs/by-name/sy/syncthingtray/package.nix b/pkgs/by-name/sy/syncthingtray/package.nix index 888359d44cbf..43b82684ef26 100644 --- a/pkgs/by-name/sy/syncthingtray/package.nix +++ b/pkgs/by-name/sy/syncthingtray/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "QT_PACKAGE_PREFIX" "Qt${lib.versions.major kdePackages.qtbase.version}") (lib.cmakeFeature "KF_PACKAGE_PREFIX" "KF${lib.versions.major kdePackages.qtbase.version}") - (lib.cmakeBool "BUILD_TESTING" (finalAttrs.doCheck or false)) + (lib.cmakeBool "BUILD_TESTING" (finalAttrs.finalPackage.doCheck or false)) # See https://github.com/Martchus/syncthingtray/issues/208 (lib.cmakeBool "EXCLUDE_TESTS_FROM_ALL" false) (lib.cmakeFeature "AUTOSTART_EXEC_PATH" autostartExecPath) diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix index 08cb74052dce..f0ccd27b4c54 100644 --- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix +++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix @@ -84,8 +84,8 @@ chosenStdenv.mkDerivation (finalAttrs: { ''; configureFlags = [ - (lib.enableFeature finalAttrs.doCheck "unit") - (lib.enableFeature finalAttrs.doCheck "integration") + (lib.enableFeature finalAttrs.finalPackage.doCheck "unit") + (lib.enableFeature finalAttrs.finalPackage.doCheck "integration") # Strangely, it uses --with-fapi=yes|no instead of a normal configure flag. "--with-fapi=${lib.boolToYesNo fapiSupport}" diff --git a/pkgs/by-name/tt/tt-umd/package.nix b/pkgs/by-name/tt/tt-umd/package.nix index 1baef8f79876..23b2e44c2cf8 100644 --- a/pkgs/by-name/tt/tt-umd/package.nix +++ b/pkgs/by-name/tt/tt-umd/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-g+ZPKBUhBGlgvce8uTkuR983unD2kbQKgoddko7x+fk="; }) )) - (lib.cmakeBool "TT_UMD_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "TT_UMD_BUILD_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "TT_UMD_BUILD_STATIC" stdenv.hostPlatform.isStatic) (lib.cmakeBool "TT_UMD_BUILD_PYTHON" true) (lib.cmakeFeature "nanobind_DIR" "${python3.pkgs.nanobind}/${python3.sitePackages}/nanobind/cmake") diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index 438aacec0e10..be4c6d6746bd 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { ''; # Tests require networking. - __darwinAllowLocalNetworking = finalAttrs.doCheck; + __darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck; postInstall = '' mv $out/bin/wireguard $out/bin/wireguard-go diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix index 30a177ebc7a4..1a943e5d0a04 100644 --- a/pkgs/by-name/z3/z3/package.nix +++ b/pkgs/by-name/z3/z3/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "Z3_SINGLE_THREADED" (!finalAttrs.enableParallelBuilding)) (lib.cmakeBool "Z3_BUILD_LIBZ3_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out")) - (lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.doCheck) + (lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "Z3_ENABLE_EXAMPLE_TARGETS" false) ] ++ lib.optionals pythonBindings [ diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 6748970eec43..4a7497107750 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ texinfo ] - ++ lib.optionals finalAttrs.doCheck ( + ++ lib.optionals finalAttrs.finalPackage.doCheck ( [ which writableTmpDirAsHomeHook diff --git a/pkgs/development/cuda-modules/packages/cutlass.nix b/pkgs/development/cuda-modules/packages/cutlass.nix index 1866bba22a03..cc3185bfe846 100644 --- a/pkgs/development/cuda-modules/packages/cutlass.nix +++ b/pkgs/development/cuda-modules/packages/cutlass.nix @@ -152,8 +152,8 @@ backendStdenv.mkDerivation (finalAttrs: { (cmakeBool "CUTLASS_ENABLE_EXAMPLES" false) # Tests. - (cmakeBool "CUTLASS_ENABLE_TESTS" finalAttrs.doCheck) - (cmakeBool "CUTLASS_ENABLE_GTEST_UNIT_TESTS" finalAttrs.doCheck) + (cmakeBool "CUTLASS_ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (cmakeBool "CUTLASS_ENABLE_GTEST_UNIT_TESTS" finalAttrs.finalPackage.doCheck) (cmakeBool "CUTLASS_USE_SYSTEM_GOOGLETEST" true) # NOTE: Both CUDNN and CUBLAS can be used by the examples and the profiler. Since they are large dependencies, they @@ -189,12 +189,12 @@ backendStdenv.mkDerivation (finalAttrs: { # NOTE: Because the test cases immediately create and try to run the binaries, we don't have an opportunity # to patch them with autoAddDriverRunpath. To get around this, we add the driver runpath to the environment. # TODO: This would break Jetson when using cuda_compat, as it must come first. - preCheck = optionalString finalAttrs.doCheck '' + preCheck = optionalString finalAttrs.finalPackage.doCheck '' export LD_LIBRARY_PATH="$(readlink -mnv "${addDriverRunpath.driverLink}/lib")" ''; # This is *not* a derivation you want to build on a small machine. - requiredSystemFeatures = optionals finalAttrs.doCheck [ + requiredSystemFeatures = optionals finalAttrs.finalPackage.doCheck [ "big-parallel" "cuda" ]; diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix index cd326bdde201..a5aea393f5da 100644 --- a/pkgs/development/ocaml-modules/graphql/cohttp.nix +++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix @@ -28,7 +28,7 @@ buildDunePackage (finalAttrs: { ocplib-endian ]; - checkInputs = lib.optionals finalAttrs.doCheck [ + checkInputs = lib.optionals finalAttrs.finalPackage.doCheck [ alcotest cohttp-lwt-unix graphql-lwt diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 66e1a3fc5726..43f29e738079 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString finalAttrs.doCheck} + ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString finalAttrs.finalPackage.doCheck} runHook postBuild ''; diff --git a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix index bac33aa72990..3ab1bb644688 100644 --- a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix +++ b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; nativeCheckInputs = [ diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 498a1255761d..898782104398 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" "-DINSTALL_SYSTEMD_UNITS=true" - "-DSKIP_TESTS=${lib.boolToString (!finalAttrs.doCheck)}" + "-DSKIP_TESTS=${lib.boolToString (!finalAttrs.finalPackage.doCheck)}" ] # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index 7662dc24e943..0063e1e4a086 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ gtest ] ++ lib.optional nvidia addDriverRunpath;