Merge branch master into haskell-updates

Conflicts from #341407 resolved.

1 files changed, 3 insertions, 3 deletions

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index f76b7a766e77..96d8976922bd 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -245,7 +245,7 @@ python.pkgs.buildPythonApplication rec {
         # docx2txt, nixpkgs packages another project named the same, which does not work
       ])
       # oggvideotools is broken on Darwin, please put it back when it will be fixed?
-      ++ lib.optionals stdenv.isLinux [ oggvideotools ]
+      ++ lib.optionals stdenv.hostPlatform.isLinux [ oggvideotools ]
       # This doesn't work on aarch64-darwin
       ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ gnumeric ]
     )
@@ -272,7 +272,7 @@ python.pkgs.buildPythonApplication rec {
       # Fails because it fails to determine llvm version
       "test_item3_deflate_llvm_bitcode"
     ]
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # Disable flaky tests on Darwin
       "test_non_unicode_filename"
       "test_listing"
@@ -288,7 +288,7 @@ python.pkgs.buildPythonApplication rec {
       "test_libmix_differences"
     ];
 
-  disabledTestPaths = lib.optionals stdenv.isDarwin [
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
     "tests/comparators/test_git.py"
     "tests/comparators/test_java.py"
     "tests/comparators/test_uimage.py"