summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2023-02-20 21:47:26 +0100
committerVladimír Čunát <v@cunat.cz>2023-02-20 21:47:26 +0100
commitdde4603b489f5f8877942f6f6931ca839844e6e7 (patch)
treea05f6c08361ea839e5e69d442cae968041d432dd /pkgs/top-level
parent48c6c4519dbdc28d8658ec0cf667e7ec2a27d47a (diff)
parent64076a9875f7802cff49083e2f5e5779268ad5e0 (diff)
downloadnixpkgs-dde4603b489f5f8877942f6f6931ca839844e6e7.tar
nixpkgs-dde4603b489f5f8877942f6f6931ca839844e6e7.tar.gz
nixpkgs-dde4603b489f5f8877942f6f6931ca839844e6e7.tar.bz2
nixpkgs-dde4603b489f5f8877942f6f6931ca839844e6e7.tar.lz
nixpkgs-dde4603b489f5f8877942f6f6931ca839844e6e7.tar.xz
nixpkgs-dde4603b489f5f8877942f6f6931ca839844e6e7.tar.zst
nixpkgs-dde4603b489f5f8877942f6f6931ca839844e6e7.zip
Merge #216796: directx-shader-compiler: build with gcc11 for i686
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d871f79cad..83d791fa76d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24404,7 +24404,10 @@ with pkgs;
 
   directx-headers = callPackage ../development/libraries/directx-headers {};
 
-  directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {};
+  directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {
+    # https://github.com/NixOS/nixpkgs/issues/216294
+    stdenv = if stdenv.cc.isGNU && stdenv.isi686 then gcc11Stdenv else stdenv;
+  };
 
   dkimproxy = callPackage ../servers/mail/dkimproxy { };