From 29ab705c17d0477801357c562ab9b600b2f803d0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 30 Jul 2024 18:31:23 +0200 Subject: [PATCH] treewide: finalAttrs.doCheck -> finalAttrs.finalPackage.doCheck repeat of #271241 discussion: #272978 I did not replace the instance in eiwd, since it causes an infinite recursion. --- pkgs/applications/science/logic/bitwuzla/default.nix | 2 +- pkgs/by-name/ay/ayatana-indicator-messages/package.nix | 2 +- pkgs/by-name/bn/bngblaster/package.nix | 4 ++-- pkgs/by-name/cp/cppitertools/package.nix | 2 +- pkgs/by-name/di/digikam/package.nix | 2 +- pkgs/by-name/ei/eiwd/package.nix | 2 +- pkgs/by-name/fo/fooyin/package.nix | 2 +- pkgs/by-name/gf/gfal2/package.nix | 4 ++-- pkgs/by-name/in/influxdb-cxx/package.nix | 4 ++-- pkgs/by-name/li/libdict/package.nix | 2 +- pkgs/by-name/ne/neovim-unwrapped/package.nix | 4 ++-- pkgs/by-name/pa/parallel-hashmap/package.nix | 2 +- pkgs/desktops/lomiri/applications/morph-browser/default.nix | 2 +- pkgs/desktops/lomiri/development/trust-store/default.nix | 2 +- pkgs/desktops/lomiri/development/u1db-qt/default.nix | 2 +- .../lomiri/qml/lomiri-settings-components/default.nix | 2 +- pkgs/desktops/lomiri/services/biometryd/default.nix | 2 +- .../lomiri/services/lomiri-indicator-network/default.nix | 2 +- .../desktops/lomiri/services/lomiri-thumbnailer/default.nix | 2 +- pkgs/desktops/lomiri/services/mediascanner2/default.nix | 2 +- pkgs/development/libraries/accounts-qml-module/default.nix | 2 +- pkgs/development/libraries/box2d/default.nix | 2 +- pkgs/development/libraries/folks/default.nix | 2 +- pkgs/development/libraries/gvfs/default.nix | 2 +- pkgs/development/libraries/iniparser/default.nix | 6 +++--- pkgs/development/libraries/libadwaita/default.nix | 2 +- pkgs/development/libraries/libe57format/default.nix | 2 +- pkgs/development/libraries/libepoxy/default.nix | 2 +- pkgs/development/tools/analysis/rr/default.nix | 2 +- pkgs/games/gcompris/default.nix | 2 +- pkgs/tools/compression/lz4/default.nix | 2 +- pkgs/tools/package-management/nix/nix-perl.nix | 2 +- pkgs/tools/security/bkcrack/default.nix | 2 +- 33 files changed, 39 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index c1eb751fb1a5..f5a5296de9c4 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # but setting it to shared works even in pkgsStatic "-Ddefault_library=shared" - (lib.strings.mesonEnable "testing" finalAttrs.doCheck) + (lib.strings.mesonEnable "testing" finalAttrs.finalPackage.doCheck) ]; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix index 5810ccd89d41..84156c380527 100644 --- a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" "-DGSETTINGS_LOCALINSTALL=ON" "-DGSETTINGS_COMPILE=ON" ]; diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index 7adf360ac09a..b93868948616 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: { jansson openssl cmocka - ] ++ lib.optionals finalAttrs.doCheck [ libpcap ]; + ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ libpcap ]; cmakeFlags = [ - "-DBNGBLASTER_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DBNGBLASTER_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DBNGBLASTER_VERSION=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/cp/cppitertools/package.nix b/pkgs/by-name/cp/cppitertools/package.nix index a26b26fa1d50..e9ddcdb1b339 100644 --- a/pkgs/by-name/cp/cppitertools/package.nix +++ b/pkgs/by-name/cp/cppitertools/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt \ --replace-fail " DIRECTORY ." " DIRECTORY . EXCLUDE_FROM_ALL" '' - + lib.optionalString finalAttrs.doCheck '' + + lib.optionalString finalAttrs.finalPackage.doCheck '' # Required for tests. cp ${lib.getDev catch2}/include/catch2/catch.hpp test/ ''; diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 1454eae6717a..3f2623d612c3 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ kdePackages.qtdeclarative ]; - postConfigure = lib.optionalString finalAttrs.doCheck '' + postConfigure = lib.optionalString finalAttrs.finalPackage.doCheck '' ln -s ${testData} $cmakeDir/test-data ''; diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix index 738ba347cf9c..ed59d32299fa 100644 --- a/pkgs/by-name/ei/eiwd/package.nix +++ b/pkgs/by-name/ei/eiwd/package.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $doc/share/doc cp -a doc $doc/share/doc/iwd cp -a README AUTHORS TODO $doc/share/doc/iwd - '' + lib.optionalString finalAttrs.doCheck '' + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' mkdir -p $test/bin cp -a test/* $test/bin/ ''; diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix index f61506f28d6a..5181e5e797f7 100644 --- a/pkgs/by-name/fo/fooyin/package.nix +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTING" (finalAttrs.doCheck or false)) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) # we need INSTALL_FHS to be true as the various artifacts are otherwise just dumped in the root # of $out and the fixupPhase cleans things up anyway (lib.cmakeBool "INSTALL_FHS" true) diff --git a/pkgs/by-name/gf/gfal2/package.nix b/pkgs/by-name/gf/gfal2/package.nix index e46b8807473f..f9ad9d06ae45 100644 --- a/pkgs/by-name/gf/gfal2/package.nix +++ b/pkgs/by-name/gf/gfal2/package.nix @@ -98,8 +98,8 @@ stdenv.mkDerivation (finalAttrs: { (pluginName: "-DPLUGIN_${lib.toUpper pluginName}=${lib.toUpper (lib.boolToString finalAttrs.passthru.enablePluginStatus.${pluginName})}") (lib.attrNames finalAttrs.passthru.enablePluginStatus) ) - ++ [ "-DSKIP_TESTS=${lib.toUpper (lib.boolToString (!finalAttrs.doCheck))}" ] - ++ lib.optionals finalAttrs.doCheck [ "-DGTEST_INCLUDE_DIR=${gtest.dev}/include" ] + ++ [ "-DSKIP_TESTS=${lib.toUpper (lib.boolToString (!finalAttrs.finalPackage.doCheck))}" ] + ++ lib.optionals finalAttrs.finalPackage.doCheck [ "-DGTEST_INCLUDE_DIR=${gtest.dev}/include" ] ++ lib.optionals finalAttrs.passthru.enablePluginStatus.http [ "-DCRYPTOPP_INCLUDE_DIRS=${cryptopp.dev}/include/cryptopp" ] ++ lib.optionals finalAttrs.passthru.enablePluginStatus.xrootd [ "-DXROOTD_INCLUDE_DIR=${xrootd.dev}/include/xrootd" ] ; diff --git a/pkgs/by-name/in/influxdb-cxx/package.nix b/pkgs/by-name/in/influxdb-cxx/package.nix index cc97be1c6874..a5fb9cef6777 100644 --- a/pkgs/by-name/in/influxdb-cxx/package.nix +++ b/pkgs/by-name/in/influxdb-cxx/package.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; buildInputs = [ boost libcpr ] - ++ lib.optionals finalAttrs.doCheck [ catch2_3 trompeloeil ]; + ++ lib.optionals finalAttrs.finalPackage.doCheck [ catch2_3 trompeloeil ]; cmakeFlags = [ - (lib.cmakeBool "INFLUXCXX_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "INFLUXCXX_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "-E;BoostSupportTest") # requires network access ]; diff --git a/pkgs/by-name/li/libdict/package.nix b/pkgs/by-name/li/libdict/package.nix index ad2ecbf4f247..53bae127e757 100644 --- a/pkgs/by-name/li/libdict/package.nix +++ b/pkgs/by-name/li/libdict/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DLIBDICT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DLIBDICT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DLIBDICT_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 82150b9ba161..b40ffac4a3a6 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: (nvim-lpeg-dylib ps) luabitop mpack - ] ++ lib.optionals finalAttrs.doCheck [ + ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ luv coxpcall busted @@ -105,7 +105,7 @@ in { tree-sitter unibilium ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ] - ++ lib.optionals finalAttrs.doCheck [ glibcLocales procps ] + ++ lib.optionals finalAttrs.finalPackage.doCheck [ glibcLocales procps ] ; doCheck = false; diff --git a/pkgs/by-name/pa/parallel-hashmap/package.nix b/pkgs/by-name/pa/parallel-hashmap/package.nix index 6a944d804fce..7b23f14045f7 100644 --- a/pkgs/by-name/pa/parallel-hashmap/package.nix +++ b/pkgs/by-name/pa/parallel-hashmap/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DPHMAP_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DPHMAP_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DPHMAP_BUILD_EXAMPLES=OFF" ]; diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index f6e92d0c3504..12c71a4f90b8 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/app/webbrowser/morph-browser.desktop.in.in \ --replace 'Icon=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser.svg' 'Icon=/run/current-system/sw/share/icons/hicolor/scalable/apps/morph-browser.svg' \ --replace 'X-Lomiri-Splash-Image=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser-splash.svg' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/morph-browser.svg' - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' substituteInPlace CMakeLists.txt \ --replace 'add_subdirectory(tests)' "" ''; diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix index fbbd8cf4ac6f..0e86eac2d610 100644 --- a/pkgs/desktops/lomiri/development/trust-store/default.nix +++ b/pkgs/desktops/lomiri/development/trust-store/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/core/trust/terminal_agent.h \ --replace-fail '/bin/whiptail' '${lib.getExe' newt "whiptail"}' - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' substituteInPlace CMakeLists.txt \ --replace-fail 'add_subdirectory(tests)' "" ''; diff --git a/pkgs/desktops/lomiri/development/u1db-qt/default.nix b/pkgs/desktops/lomiri/development/u1db-qt/default.nix index a141abb79d69..8eeffa84ce35 100644 --- a/pkgs/desktops/lomiri/development/u1db-qt/default.nix +++ b/pkgs/desktops/lomiri/development/u1db-qt/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { # For our automatic pkg-config output patcher to work, prefix must be used here substituteInPlace libu1db-qt.pc.in \ --replace-fail 'libdir=''${exec_prefix}/lib' 'libdir=''${prefix}/lib' - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' # Other locations add dependencies to custom check target from tests substituteInPlace CMakeLists.txt \ --replace-fail 'add_subdirectory(tests)' 'add_custom_target(check COMMAND "echo check dummy")' diff --git a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix index 8da32d4b1581..09fbe7d9b6eb 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt \ --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" '${placeholder "out"}/${qtbase.qtQmlPrefix}' - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' sed -i CMakeLists.txt \ -e '/add_subdirectory(tests)/d' ''; diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix index 6ae46fbc158b..d8f65fea41a7 100644 --- a/pkgs/desktops/lomiri/services/biometryd/default.nix +++ b/pkgs/desktops/lomiri/services/biometryd/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace data/biometryd.pc.in \ --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' \ --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}' \ - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt ''; diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index fc552881f469..a24de68abbcd 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) (lib.cmakeBool "GSETTINGS_COMPILE" true) - (lib.cmakeBool "ENABLE_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # just in case something needs it (lib.cmakeBool "BUILD_DOC" true) # lacks QML docs, needs qdoc: https://github.com/NixOS/nixpkgs/pull/245379 ]; diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index ef9ed8f07257..b6e07f20831d 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { doxygen gdk-pixbuf # setup hook pkg-config - (python3.withPackages (ps: with ps; lib.optionals finalAttrs.doCheck [ + (python3.withPackages (ps: with ps; lib.optionals finalAttrs.finalPackage.doCheck [ python-dbusmock tornado ])) diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index d9470668ce1d..b8d562367e61 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/development/libraries/accounts-qml-module/default.nix b/pkgs/development/libraries/accounts-qml-module/default.nix index aa68cb105af3..858f9c0d57b8 100644 --- a/pkgs/development/libraries/accounts-qml-module/default.nix +++ b/pkgs/development/libraries/accounts-qml-module/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { # Don't install test binary sed -i tests/tst_plugin.pro \ -e '/TARGET = tst_plugin/a INSTALLS -= target' - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' sed -i accounts-qml-module.pro -e '/tests/d' ''; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 2008cab52ac3..10bbd202019c 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.doCheck) + (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; prePatch = '' diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 8a44cd09dac9..edbebdb1b8da 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddocs=true" "-Dtelepathy_backend=${lib.boolToString telepathySupport}" - "-Dtests=${lib.boolToString (finalAttrs.doCheck && stdenv.isLinux)}" + "-Dtests=${lib.boolToString (finalAttrs.finalPackage.doCheck && stdenv.isLinux)}" ]; # backends/eds/lib/libfolks-eds.so.26.0.0.p/edsf-persona-store.c:10697:4: diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 1b7b5f0ece12..3fea0ff9cea2 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" - doInstallCheck = finalAttrs.doCheck; + doInstallCheck = finalAttrs.finalPackage.doCheck; separateDebugInfo = true; diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index a35deb12e683..b0bb4dce192f 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-R069LuOmjCFj7dHXiMjuK7WUupk5+dVd8IDKY/wBn2o="; }; - patches = lib.optionals finalAttrs.doCheck [ + patches = lib.optionals finalAttrs.finalPackage.doCheck [ (substituteAll { # Do not let cmake's fetchContent download unity src = ./remove-fetchcontent-usage.patch; @@ -48,9 +48,9 @@ stdenv.mkDerivation (finalAttrs: { cmake doxygen validatePkgConfig - ] ++ lib.optionals finalAttrs.doCheck [ ruby ]; + ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ ruby ]; - cmakeFlags = [ "-DBUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}" ]; + cmakeFlags = [ "-DBUILD_TESTING=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ]; doCheck = false; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index cfb86575f52d..795484274ffa 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dgtk_doc=true" - ] ++ lib.optionals (!finalAttrs.doCheck) [ + ] ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "-Dtests=false" ]; diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/development/libraries/libe57format/default.nix index 41fda970294d..7e70cb950310 100644 --- a/pkgs/development/libraries/libe57format/default.nix +++ b/pkgs/development/libraries/libe57format/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # See https://github.com/asmaloney/libE57Format/blob/9372bdea8db2cc0c032a08f6d655a53833d484b8/test/README.md - (if finalAttrs.doCheck + (if finalAttrs.finalPackage.doCheck then "-DE57_TEST_DATA_PATH=${finalAttrs.libE57Format-test-data_src}" else "-DE57_BUILD_TEST=OFF" ) diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index d95bf8d623cb..f771ad140b55 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Degl=${if (x11Support && !stdenv.isDarwin) then "yes" else "no"}" "-Dglx=${if x11Support then "yes" else "no"}" - "-Dtests=${lib.boolToString finalAttrs.doCheck}" + "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" "-Dx11=${lib.boolToString x11Support}" ]; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 080fd3cd81fb..3c10f4cc5716 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "disable32bit" true) - (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; # we turn on additional warnings due to hardening diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 6b5168fa8c5a..61778a120f93 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "QML_BOX2D_LIBRARY" "${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.1") - (lib.cmakeBool "BUILD_TESTING" (finalAttrs.doCheck or false)) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) ]; nativeBuildInputs = [ cmake extra-cmake-modules gettext ninja qttools wrapQtAppsHook ]; diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 67bc9016cace..6b2c1a43b2fe 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = lib.optionals finalAttrs.doCheck [ + buildInputs = lib.optionals finalAttrs.finalPackage.doCheck [ valgrind ]; diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix index 8fc2657657af..2233525ec62e 100644 --- a/pkgs/tools/package-management/nix/nix-perl.nix +++ b/pkgs/tools/package-management/nix/nix-perl.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation (finalAttrs: { value = "${perl.pkgs.DBDSQLite}/${perl.libPrefix}"; }) ] ++ lib.optionals atLeast223 [ - (lib.mesonEnable "tests" finalAttrs.doCheck) + (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) ]; preConfigure = "export NIX_STATE_DIR=$TMPDIR"; diff --git a/pkgs/tools/security/bkcrack/default.nix b/pkgs/tools/security/bkcrack/default.nix index 5bebb8618b7e..1af16ffe14df 100644 --- a/pkgs/tools/security/bkcrack/default.nix +++ b/pkgs/tools/security/bkcrack/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBKCRACK_BUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DBKCRACK_BUILD_TESTING=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ]; postInstall = ''