wine: use gcc13 for stdenv_32bit

fufexan · Jan 7, 2025 · 3d29fbf · 3d29fbf
1 parent c94feb6
commit 3d29fbf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -26,7 +26,7 @@
       wineBuilder = wine: build: extra:
         (import ./wine ({
             inherit inputs self pkgs build pins;
-            inherit (pkgs) callPackage fetchFromGitHub fetchurl lib moltenvk pkgsCross pkgsi686Linux stdenv_32bit;
+            inherit (pkgs) callPackage fetchFromGitHub fetchurl lib moltenvk pkgsCross pkgsi686Linux stdenv_32bit stdenv wrapCCMulti overrideCC gcc13;
             supportFlags = (import ./wine/supportFlags.nix).${build};
           }
           // extra))

diff --git a/pkgs/wine/default.nix b/pkgs/wine/default.nix
@@ -13,6 +13,10 @@
   moltenvk,
   supportFlags,
   stdenv_32bit,
+  overrideCC,
+  wrapCCMulti,
+  gcc13,
+  stdenv,
 }: let
   nixpkgs-wine = builtins.path {
     path = inputs.nixpkgs;
@@ -37,8 +41,7 @@
     monos = with sources; [mono];
     pkgArches = [pkgs pkgsi686Linux];
     platforms = ["x86_64-linux"];
-    # stdenv = pkgs.overrideCC stdenv_32bit pkgs.gcc13;
-    stdenv = stdenv_32bit;
+    stdenv = overrideCC stdenv (wrapCCMulti gcc13);
     wineRelease = "unstable";
   };