diff --git a/flake.nix b/flake.nix
index 5d3a660d..c24b73f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,7 +77,9 @@
     });
 
     devShells = eachSystem (system: {
-      default = pkgsFor.${system}.mkShell {
+      default = pkgsFor.${system}.mkShell.override {
+        stdenv = pkgsFor.${system}.gcc13Stdenv;
+      } {
         name = "hyprland-shell";
         nativeBuildInputs = with pkgsFor.${system}; [cmake python3];
         buildInputs = [self.packages.${system}.wlroots-hyprland];
diff --git a/nix/default.nix b/nix/default.nix
index 46302e41..96fa12d7 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  gcc13Stdenv,
   pkg-config,
   makeWrapper,
   meson,
@@ -40,7 +39,7 @@
 }:
 assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renamed `enableNvidiaPatches`";
 assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
-  gcc13Stdenv.mkDerivation {
+  stdenv.mkDerivation {
     pname = "hyprland${lib.optionalString enableNvidiaPatches "-nvidia"}${lib.optionalString debug "-debug"}";
     inherit version;
 
diff --git a/nix/overlays.nix b/nix/overlays.nix
index ba0ac302..dbdfc6a2 100644
--- a/nix/overlays.nix
+++ b/nix/overlays.nix
@@ -30,6 +30,7 @@ in {
     # Hyprland packages themselves
     (final: prev: {
       hyprland = final.callPackage ./default.nix {
+        stdenv = final.gcc13Stdenv;
         version = "${props.version}+date=${mkDate (self.lastModifiedDate or "19700101")}_${self.shortRev or "dirty"}";
         wlroots = final.wlroots-hyprland;
         commit = self.rev or "";