diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-06-07 23:43:37 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-06-08 07:43:56 +0100 |
| commit | c6132dcf238b8ddc01174290fe31ed5001a58c01 (patch) | |
| tree | 808208ac3df5da0b9525eb84f482330020c23950 /pkgs/misc/dxvk | |
| parent | 8820dd8b7b1e71c3b65ff8887ff1405812237f65 (diff) | |
| download | nixpkgs-c6132dcf238b8ddc01174290fe31ed5001a58c01.tar nixpkgs-c6132dcf238b8ddc01174290fe31ed5001a58c01.tar.gz nixpkgs-c6132dcf238b8ddc01174290fe31ed5001a58c01.tar.bz2 nixpkgs-c6132dcf238b8ddc01174290fe31ed5001a58c01.tar.lz nixpkgs-c6132dcf238b8ddc01174290fe31ed5001a58c01.tar.xz nixpkgs-c6132dcf238b8ddc01174290fe31ed5001a58c01.tar.zst nixpkgs-c6132dcf238b8ddc01174290fe31ed5001a58c01.zip | |
pkgsCross.mingwW64.windows.mcfgthreads: add gcc13 compatible version
Upstream `gcc-13` merged `mcfgthreads` support with a caveat: it's
headers interface is not compatible with the patch `nixpkgs` was
carrying in `gcc-12` and before.
To keep both new (`gcc13`) and old (`_pre_gcc13`) version I held back
previous `windows.mcfgthreads` attribute as
`windows.mcfgthreads_pre_gcc_13`. It is used for `gcc` before 13.
The change fixes the build of `pkgsCross.mingwW64.stdenv` itself and
example program:
$ nix build --impure --expr 'with import ./. {}; pkgsCross.mingwW64.re2c.override { stdenv = pkgsCross.mingwW64.gcc11Stdenv; }'
Diffstat (limited to 'pkgs/misc/dxvk')
| -rw-r--r-- | pkgs/misc/dxvk/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix index e553d9b365c..49b6c4d0beb 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/misc/dxvk/default.nix @@ -27,8 +27,8 @@ stdenvNoCC.mkDerivation (finalAttrs: --subst-var-by bash ${bash} \ --subst-var-by dxvk32 ${dxvk32} \ --subst-var-by dxvk64 ${dxvk64} \ - --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \ - --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" + --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads_pre_gcc_13}" \ + --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads_pre_gcc_13}" chmod a+x $out/bin/setup_dxvk.sh declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) for arch in "''${!dxvks[@]}"; do |