diff --git a/nixpkgs/nixpkgs.patch b/nixpkgs/nixpkgs.patch
index e3a2a2a..e678037 100644
--- a/nixpkgs/nixpkgs.patch
+++ b/nixpkgs/nixpkgs.patch
@@ -117,3 +117,20 @@ index 4d847e280f4..874b776c1e1 100644
 +  inherit config overlays;
 +  localSystem = localSystem';
  })
+diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
+index 6cb494d46e5..f53cfde3bad 100644
+--- a/pkgs/stdenv/generic/make-derivation.nix
++++ b/pkgs/stdenv/generic/make-derivation.nix
+@@ -165,10 +165,8 @@ let
+ , ... } @ attrs:
+
+ let
+-  # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
+-  # no package has `doCheck = true`.
+-  doCheck' = doCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+-  doInstallCheck' = doInstallCheck && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
++  doCheck' = config.doCheckByDefault && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
++  doInstallCheck' = config.doCheckByDefault && stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+   separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux;
+   outputs' = outputs ++ lib.optional separateDebugInfo' "debug";