Commit Graph

103 Commits

Author SHA1 Message Date
Kacper Koniuszy
fe0481e7d8 wineWow64Packages.stagingFull: fix patch failure
The gitapply.sh script from wine-staging tries to use 'git apply' first.
If git is not present, it will fall back to using the patch command.

As of wine 9.13, at least one of the patches doesn't apply correctly with
'patch', but it works with git. Adding gitMinimal to nativeBuildInputs
fixes the build errors.
2024-07-29 19:06:42 +02:00
Kacper Koniuszy
d69bd1a75b wineWow64Packages.unstableFull: 9.12 -> 9.14 2024-07-29 19:06:06 +02:00
Martin Weinelt
9b79a05ae1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/flexcache/default.nix
- pkgs/development/python-modules/flexparser/default.nix
- pkgs/development/python-modules/odp-amsterdam/default.nix
- pkgs/development/python-modules/pint/default.nix
- pkgs/development/python-modules/uncertainties/default.nix
- pkgs/top-level/python-packages.nix
2024-07-01 01:07:21 +02:00
R. Ryantm
6de7e2e9f6 wineWow64Packages.unstable: 9.11 -> 9.12 2024-06-30 12:41:47 +00:00
Rick van Schijndel
43ce0f9ee0
Merge pull request #318256 from risicle/ris-stack-clash-protection
cc-wrapper: add stack clash protection hardening flag
2024-06-19 19:54:30 +02:00
R. Ryantm
65135e7b5c wineWow64Packages.unstable: 9.10 -> 9.11 2024-06-16 03:49:09 +00:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Robert Scott
0e49cbda2e wine: disable stackclashprotection hardening flag 2024-06-07 20:23:46 +01:00
Alexander V. Nikolaev
a8506f499f
wine64Packages.{unstable,staging}: 9.9 -> 9.10 2024-06-02 18:46:32 +03:00
Randy Eckenrode
a886427a1d
wine64Packages.{unstable,staging}: 9.8 -> 9.9
https://gitlab.winehq.org/wine/wine/-/releases/wine-9.9
2024-05-18 08:57:18 -04:00
7c6f434c
0a64b544fd
Merge pull request #307450 from reckenrode/wine-fixes
winePackages.{stable,unstable,staging}: cleanups
2024-05-11 15:28:17 +00:00
R. Ryantm
c8819597e3 wineWow64Packages.unstable: 9.7 -> 9.8 2024-05-08 02:51:42 +00:00
Randy Eckenrode
f5df1382ab
winePackages.{stable,unstable,staging}: cleanups
- Make util-linux conditional in wine-staging due to `uuid.h` conflicts;
- Remove `lib.overrideDerivation`, allowing wine-staging overrides;
- Use `overrideSDK` to build with the 11.0 SDK with a 10.7 deployment
  target, matching the deployment target of the unofficial Mac packages;
- Drop all Darwin-related patches. They’re not needed with the 11.0 SDK;
- Switch to conditionally using `badPlatforms` instead of using a mix of
  `broken` and filtering Darwin from `meta.platforms`; and
- Remove unnecessary rpath references to Darwin frameworks.
2024-04-28 22:52:26 -04:00
R. Ryantm
07f3dbf22d wine-staging: 9.6 -> 9.7 2024-04-21 17:07:54 +00:00
John Titor
dcf250feab
wineWow64Packages.unstable: 9.5 -> 9.6 2024-04-07 12:29:30 +05:30
R. Ryantm
91537206d1 wineWow64Packages.unstable: 9.4 -> 9.5 2024-03-24 02:39:05 +00:00
stuebinm
ff1a94e523 treewide: add meta.mainProgram to packages with a single binary
The nixpkgs-unstable channel's programs.sqlite was used to identify
packages producing exactly one binary, and these automatically added
to their package definitions wherever possible.
2024-03-19 03:14:51 +01:00
R. Ryantm
59322d8a36 wineWow64Packages.unstable: 9.3 -> 9.4 2024-03-09 13:10:34 +00:00
R. Ryantm
c683f362a5 wineWow64Packages.unstable: 9.2 -> 9.3 2024-02-26 17:58:09 +00:00
Sergei Trofimovich
8f3b751ca8 wineWowPackages.minimal: fix build (missing --without-x)
Without the change build fails on `master` as
https://hydra.nixos.org/build/249529907:

    checking for X... no
    configure: error: X 64-bit development files not found. Wine will be built
    without X support, which probably isn't what you want. You will need
    to install 64-bit development packages of Xlib at the very least.
    Use the --without-x option if you really want this.

The change explicitly passes `--without-x` for `wine` without
`x11Support`.

Co-authored-by: MinerSebas <66798382+MinerSebas@users.noreply.github.com>
2024-02-24 08:02:22 +00:00
Martino Fontana
b2182b9130 wine: cleanup Wayland
Makes base.nix less Wayland-centric. This means:
- Don't specify support in the meta.description (since even regular Wine supports it, it's specified everywhere)
- `x11Support` and `waylandSupport` are now set in `wine-packages.nix`, like every other flag (they are also now disabled on minimal)
- Disable Darwin in supported platforms if an incompatible supportFlag is true (not just `waylandSupport`)
- Add wineRelease name for every release other than "stable" or "unstable", instead of just "wayland"
  - This also fixes an inconsistency on wine-staging, where "-staging" was written after the version
2024-02-11 14:39:31 +01:00
Martino Fontana
2e2211a386 wine: don't default mingwSupport to true outside stable release
This way, minimal Wine will build without it
2024-02-11 14:39:31 +01:00
Martino Fontana
62c998c0bb winePackages.{unstable,staging}: 9.1 -> 9.2 2024-02-11 14:39:22 +01:00
Martino Fontana
c3c693491c winePackages.{unstable,staging}: 9.0 -> 9.1 2024-02-10 19:00:23 +01:00
Aman Setia
00f48620ac winePackages.*: Enable wayland driver; wine-waylan
..d only add -wayland prefix if wine-wayland package is selected otherwise keep the original name
2024-01-20 21:08:49 +01:00
Stefan Frijters
38f7be8b49
wineWow64Packages.minimal: fix build 2024-01-19 20:21:13 +01:00
Stefan Frijters
f5d71218d5
winetricks: 20230212 -> 20240105 2024-01-19 00:25:43 +01:00
Stefan Frijters
352690d43c
winePackages.{unstable,staging}: 9.0-rc1 -> 9.0 2024-01-19 00:25:25 +01:00
Stefan Frijters
f60836eb3a
winePackages.stable: 8.0.2 -> 9.0 2024-01-19 00:24:51 +01:00
Martino Fontana
d3d9c1c6b1 winePackages.{unstable,staging}: 8.20 -> 9.0-rc1 2023-12-10 01:00:06 +01:00
Randy Eckenrode
bf7ad8cfbf
wine64Packages.minimal: mark broken on Darwin
Darwin requires MinGW to build Wine because clang does not support
`-mabi=ms`, which is required when building without MinGW .
2023-11-18 10:44:39 -05:00
Randy Eckenrode
fc2852466d
wineWow64Packages: fix build on Darwin 2023-11-18 10:30:48 -05:00
Randy Eckenrode
fd2703130c
wine64Packages: 8.17 -> 8.20
https://www.winehq.org/announce/8.18
https://www.winehq.org/announce/8.19
https://www.winehq.org/announce/8.20
2023-11-18 10:30:48 -05:00
K900
456c78708d wine-staging: 8.17 -> 8.17.1
Upstream rebased the patches wrong, so here's a hotfix release.
2023-10-08 10:58:03 +03:00
Martino Fontana
66eebd56d3 winePackages.{unstable,staging}: 8.14 -> 8.17 2023-09-30 12:02:32 +02:00
Daniel Hill
0ddfdc7c1a wine: sort supportFlags 2023-09-19 19:50:26 +12:00
Daniel Hill
07a24f168d wine: add libXfixes
Upstream recommends using this library.
2023-09-19 19:42:34 +12:00
Daniel Hill
965c429917 wine: Fix missing X11 libraries for Wayland build
The Wayland build provides both Wayland and X11 support

Wine still prioritizes X11 over Wayland by default, without these
support libraries some things don't work, including causing some games
to crash.
2023-09-19 19:42:34 +12:00
Andrew Marshall
b983f84b1f wine: install in parallel
On a 48-thread CPU, this reduced the time of `nix-build -A
wineWowPackages.stable` from ~15 min. to ~10 min.
2023-09-06 23:26:59 -04:00
Michael Raskin
7c6847bfc9 winePackages: add reckenrode as a maintainer 2023-08-28 00:43:57 +02:00
Randy Eckenrode
bdf47492d4 wine64Packages.unstable: Darwin compatibility fixes
- Wine 8.12 changed the implementation of `macdrv_get_gpus_from_metal`,
  causing the patch used by nixpkgs to break. This patch splits that
  patch up to apply cleanly depending on the version;
- Silence an implicit pointer to integer conversion warning due to the
  above patch (required by the Clang 16 stdenv bump);
- Add the PCSC framework on Darwin, which is required as of Wine 8.14.

Wine 8.14 changes the implementation of `macdrv_get_gpus_from_metal`,
causing the patch to no longer apply cleanly. Splitting the patch allows
only the parts that are still needed to apply cleanly dependin gon the
Wine version being built.
2023-08-27 10:58:27 +02:00
R. Ryantm
0f3611743a wine64Packages.unstable: 8.13 -> 8.14 2023-08-25 11:39:02 +00:00
Stefan Frijters
33fc2f21b9
winePackages.stable: 8.0.1 -> 8.0.2 2023-07-30 23:37:50 +02:00
Martino Fontana
77160c83ca winePackages: fix gecko32 and staging hash 2023-07-25 11:15:59 +02:00
Martino Fontana
b01545f8cc winePackages.{unstable,staging}: 8.10 -> 8.13 2023-07-23 16:49:25 +02:00
K900
51e69b6caf wine: allow building with experimental wow64 mode
Allows running 32-bit applications on 64-bit native Wine, with no 32-bit libs on the system.
Works at least well enough to run pkgsCross.mingw32.hello.
2023-06-27 09:51:22 +03:00
Martino Fontana
6f4de53ca4 wine: minor cleanup 2023-06-21 15:37:03 +02:00
Martino Fontana
61dd9efa12 wine: fix gstreamer on WoW builds 2023-06-21 15:36:37 +02:00
Stefan Frijters
7c37217a76 winePackages.{unstable,staging}: 8.5 -> 8.10 2023-06-11 16:29:15 +02:00
Stefan Frijters
a9428cb1d9 winePackages.stable: 8.0 -> 8.0.1
https://www.winehq.org/announce/8.0.1
2023-06-07 10:04:39 +02:00