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/desktops | |
| parent | b3caa5f50a90a069b1f9596b48be6cb95d94171b (diff) | |
| parent | ad5e744714640aad36eda89e6b6026c397b4ace5 (diff) | |
Merge pull request #271241 from pbsds/finalattrs-docheck
treewide: finalAttrs.doCheck -> finalAttrs.finalPackage.doCheck
Diffstat (limited to 'pkgs/desktops')
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/desktops/lomiri/development/deviceinfo/default.nix b/pkgs/desktops/lomiri/development/deviceinfo/default.nix index 04abf4f88f46d..00ba1d864bf67 100644 --- a/pkgs/desktops/lomiri/development/deviceinfo/default.nix +++ b/pkgs/desktops/lomiri/development/deviceinfo/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DDISABLE_TESTS=${lib.boolToString (!finalAttrs.doCheck)}" + "-DDISABLE_TESTS=${lib.boolToString (!finalAttrs.finalPackage.doCheck)}" ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/desktops/lomiri/development/geonames/default.nix b/pkgs/desktops/lomiri/development/geonames/default.nix index ee4a3b77b72ba..8fc5a65b72ff1 100644 --- a/pkgs/desktops/lomiri/development/geonames/default.nix +++ b/pkgs/desktops/lomiri/development/geonames/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # Tests need to be able to check locale - LC_ALL = lib.optionalString finalAttrs.doCheck "en_US.UTF-8"; + LC_ALL = lib.optionalString finalAttrs.finalPackage.doCheck "en_US.UTF-8"; nativeCheckInputs = [ glibcLocales ]; @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DWANT_DOC=${lib.boolToString withDocumentation}" "-DWANT_DEMO=${lib.boolToString withExamples}" - "-DWANT_TESTS=${lib.boolToString finalAttrs.doCheck}" + "-DWANT_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" # Keeps finding & using glib-compile-resources from buildInputs otherwise "-DCMAKE_PROGRAM_PATH=${lib.makeBinPath [ buildPackages.glib.dev ]}" ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ diff --git a/pkgs/desktops/lomiri/development/gmenuharness/default.nix b/pkgs/desktops/lomiri/development/gmenuharness/default.nix index d5143e94d9147..101b6e2167774 100644 --- a/pkgs/desktops/lomiri/development/gmenuharness/default.nix +++ b/pkgs/desktops/lomiri/development/gmenuharness/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-Denable_tests=${lib.boolToString finalAttrs.doCheck}" + "-Denable_tests=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; dontWrapQtApps = true; diff --git a/pkgs/desktops/lomiri/development/libusermetrics/default.nix b/pkgs/desktops/lomiri/development/libusermetrics/default.nix index 7ccaccfa395e0..0c4ed003e5971 100644 --- a/pkgs/desktops/lomiri/development/libusermetrics/default.nix +++ b/pkgs/desktops/lomiri/development/libusermetrics/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace doc/CMakeLists.txt \ --replace "\''${CMAKE_INSTALL_DATAROOTDIR}/doc/libusermetrics-doc" "\''${CMAKE_INSTALL_DOCDIR}" - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' # Only needed by tests sed -i -e '/QTDBUSTEST/d' CMakeLists.txt ''; @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DGSETTINGS_LOCALINSTALL=ON" "-DGSETTINGS_COMPILE=ON" - "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; |