From 72f96cbd673960a88fdc284e5ba01f65c09ae188 Mon Sep 17 00:00:00 2001
From: Vito <5780819+Tapanito@users.noreply.github.com>
Date: Mon, 22 Jun 2026 12:14:38 +0200
Subject: [PATCH] undo nix/devshell.nix changes

---
 nix/devshell.nix | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/nix/devshell.nix b/nix/devshell.nix
index 105033eb06..1bd7ea4c0c 100644
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@@ -1,26 +1,6 @@
 { pkgs, ... }:
 let
-  # conan is in the binary cache for Linux but not for Darwin, so on Darwin
-  # it is always built from source — and its bundled test suite is unreliable
-  # in the sandbox: `test_qbsprofile_rcflags` needs gcc (absent on Darwin, see
-  # https://github.com/NixOS/nixpkgs/pull/528995) and the patch tests are
-  # flaky from source. We only use conan as a build tool, so skip its tests on
-  # Darwin. Scoped to the dev shell (not the CI env, which builds conan on
-  # Linux from the cache). Drop once the fix reaches nixos-unstable and the
-  # lock is bumped.
-  pkgs_patched =
-    if pkgs.stdenv.isDarwin then
-      pkgs.extend (
-        final: prev: {
-          conan = prev.conan.overridePythonAttrs (_: {
-            doCheck = false;
-          });
-        }
-      )
-    else
-      pkgs;
-
-  inherit (import ./packages.nix { pkgs = pkgs_patched; }) commonPackages;
+  inherit (import ./packages.nix { inherit pkgs; }) commonPackages;
 
   # Supported compiler versions
   gccVersion = pkgs.lib.range 13 15;