diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-06-11 18:04:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-11 18:04:16 +0100 |
| commit | b3ab40b9ff9eae3e1697b1ffa432ddc1b1fe7ad0 (patch) | |
| tree | d33ac9579c63723206fd7225d6baf51c985dea56 /pkgs/misc | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| parent | c6132dcf238b8ddc01174290fe31ed5001a58c01 (diff) | |
| download | nixlib-b3ab40b9ff9eae3e1697b1ffa432ddc1b1fe7ad0.tar nixlib-b3ab40b9ff9eae3e1697b1ffa432ddc1b1fe7ad0.tar.gz nixlib-b3ab40b9ff9eae3e1697b1ffa432ddc1b1fe7ad0.tar.bz2 nixlib-b3ab40b9ff9eae3e1697b1ffa432ddc1b1fe7ad0.tar.lz nixlib-b3ab40b9ff9eae3e1697b1ffa432ddc1b1fe7ad0.tar.xz nixlib-b3ab40b9ff9eae3e1697b1ffa432ddc1b1fe7ad0.tar.zst nixlib-b3ab40b9ff9eae3e1697b1ffa432ddc1b1fe7ad0.zip | |
Merge pull request #236598 from trofi/gcc-13-mcfgthreads
pkgsCross.mingwW64.windows.mcfgthreads: add gcc13 compatible version
Diffstat (limited to 'pkgs/misc')
| -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 e553d9b365cb..49b6c4d0bebd 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 |