Commit Graph

26 Commits

Author SHA1 Message Date
Sergei Trofimovich
c6132dcf23 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; }'
2023-06-08 07:43:56 +01:00
Martin Weinelt
6b67186fe9
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/crownstone-cloud/default.nix
- pkgs/development/python-modules/exrex/default.nix
- pkgs/development/python-modules/mkdocs-minify/default.nix
- pkgs/development/python-modules/myjwt/default.nix
- pkgs/development/tools/analysis/checkov/default.nix
2023-03-14 08:14:26 +01:00
Artturi
b978bf0f0f
Merge pull request #220570 from Artturin/fixlints1 2023-03-14 02:15:55 +02:00
Martin Weinelt
d03d74aa67
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/aiopulse/default.nix
- pkgs/development/python-modules/identify/default.nix
- pkgs/development/python-modules/spur/default.nix
2023-03-12 23:28:23 +01:00
novenary
b09533e71e dxvk: fix all shellcheck warnings 2023-03-12 19:41:01 +02:00
novenary
f67a9f0e27 dxvk: fix unbound variable warning in setup_dxvk.sh 2023-03-12 19:25:23 +02:00
novenary
2fc61b77cf dxvk: fix DLL override setup
`basename srcpath` simply prints "srcpath" which results in a single DLL
override for srcpath.dll to be installed... clearly not what we want.
2023-03-12 14:51:25 +02:00
Artturin
cab4a24c34 treewide: fix lints
Arg to lib.optional is a list

build time tool in buildInputs
2023-03-11 00:55:17 +02:00
Randy Eckenrode
5c31d2d23b
dxvk: improve description of dxvk derivation 2023-01-29 12:00:22 -05:00
Randy Eckenrode
81a86d07e6
dxvk: 2.0 -> 2.1
https://github.com/doitsujin/dxvk/releases/tag/v2.1
2023-01-28 14:42:55 -05:00
Randy Eckenrode
67a2ceab6a
dxvk: add native Linux build 2023-01-28 14:42:55 -05:00
Randy Eckenrode
403fe21323
dxvk: expose Windows derivations
This is in preparation for native builds of DXVK, but it also allows
users to choose to use an older version if that is more compatible with
their hardware.
2023-01-28 14:42:55 -05:00
Randy Eckenrode
16e9b55025
dxvk: vendor setup_dxvk.sh
Upstream will remove the `setup_dxvk.sh` in DXVK 2.1. To avoid breaking
users of the current derivation, vendor `setup_dxvk.sh`. This script is
based on the upstream script with some modifications:

- Update command-line parsing; and
- Reorganized action processing logic.
2023-01-28 14:42:54 -05:00
Mario Rodas
92aa3caf58 dxvk: fix pname 2023-01-28 04:20:00 +00:00
Randy Eckenrode
56c2631e5b
dxvk: fix Darwin build 2023-01-23 21:38:47 -05:00
Artturin
2eeb34c273 treewide: {build,host,target}Platform -> stdenv.{build,host,target}Platform 2023-01-09 21:13:22 +02:00
Randy Eckenrode
33b682ebaf
dxvk: 1.10.3 -> 2.0 2022-11-10 19:52:32 -05:00
Randy Eckenrode
10ec6b818b dxvk: 1.10.1 -> 1.10.3 2022-08-04 13:19:09 +02:00
Randy Eckenrode
54d3d61b0c
moltenvk: remove DXVK compatibility patches 2022-06-07 10:06:31 -04:00
Randy Eckenrode
0f7e594160
dxvk: limit to Intel platforms 2022-06-07 10:05:25 -04:00
Randy Eckenrode
2a7827fac3
dxvk: use function form of mkDerivation
This allows `overrideAttrs` to work correctly with `dxvkPatches`.
2022-06-06 23:59:19 -04:00
Randy Eckenrode
a97a4f491f
dxvk: work with unpatched MoltenVK on Darwin 2022-06-06 23:59:19 -04:00
Randy Eckenrode
2f4eedc401
dxvk: 1.10 -> 1.10.1 2022-03-26 21:04:44 -04:00
Randy Eckenrode
f29e152b7e
dxvk: support version-specific MoltenVK patches
While it’s unlikely, it’s possible that different MoltenVK versions
could require their own compatability patches. Support that by making
the `moltenvk` derivation provide the patch via `passthru`. There is no
package with the patch applied because the patch should never be used by
anything other than DXVK.
2022-03-09 11:31:10 -05:00
Randy Eckenrode
e2369cb9c9
dxvk: refactor to better support Darwin and Linux
- Move the synchronization primitive changes to their own patch, so it
  can be applied conditionally on Darwin. Also, document why this change
  is needed; and
- Refactor how `src` is handled to support allowing Darwin and Linux to
  diverge in case the Darwin patches do not apply to the latest version.
  This should address some post-merger concerns that were raised about
  Darwin’s blocking updates for Linux.
2022-03-09 11:18:05 -05:00
Randy Eckenrode
5fb9ee7f05
dxvk: init at 1.10 2022-03-07 15:15:19 -05:00