Commit Graph

120 Commits

Author SHA1 Message Date
Karolis Stasaitis
c2e08444af winetricks: enable darwin support 2024-11-30 21:36:00 +01:00
github-actions[bot]
bafb3e4e13
Merge master into staging-next 2024-10-23 12:05:38 +00:00
Alexander V. Nikolaev
da466ad660 wine64Packages.{unstable,staging}: 9.19 -> 9.20 2024-10-23 22:19:36 +11:00
Sergei Trofimovich
35ea33f20b wine: restore the eval on linux
Without the change the instantiation in `linux` fails as:

    $ nix-instantiate -A wine
    error:
       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:34:12:
           33|
           34|   strict = derivationStrict drvAttrs;
             |            ^
           35|

       … while evaluating derivation 'wine-9.0'
         whose name attribute is located at /tmp/z/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:336:7

       … while evaluating attribute 'NIX_LDFLAGS' of derivation 'wine-9.0'
         at /tmp/z/nixpkgs/pkgs/applications/emulators/wine/base.nix:121:3:
          120|   # LD_LIBRARY_PATH.
          121|   NIX_LDFLAGS = toString (map (path: "-rpath " + path) (
             |   ^
          122|       map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ]

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: Package ‘apple-sdk-14.4’ in /tmp/z/nixpkgs/pkgs/by-name/ap/apple-sdk/package.nix:111 is not available on the requested hostPlatform:
         hostPlatform.config = "i686-unknown-linux-gnu"
         package.meta.platforms = [
           "x86_64-darwin"
           "i686-darwin"
           "aarch64-darwin"
           "armv7a-darwin"
         ]
         package.meta.badPlatforms = [
           {
             cpu = {
               bits = 32;
             };
           }
         ]
       , refusing to evaluate.

       a) To temporarily allow packages that are unsupported for this system, you can use an environment variable
          for a single invocation of the nix tools.

            $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1

          Note: When using `nix shell`, `nix build`, `nix develop`, etc with a flake,
                then pass `--impure` in order to allow use of environment variables.

       b) For `nixos-rebuild` you can set
         { nixpkgs.config.allowUnsupportedSystem = true; }
       in configuration.nix to override this.

       c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
         { allowUnsupportedSystem = true; }
       to ~/.config/nixpkgs/config.nix.
2024-10-11 06:58:31 +01:00
Emily
c586a772f8
wine64Packages.{stable,unstable,staging}: use the 14.4 SDK (#346963) 2024-10-11 01:55:34 +01:00
Randy Eckenrode
0421ee2dd8
wine64Packages.{stable,unstable,staging}: use the 14.4 SDK
Wine supports a form of futexes on Darwin when built with the 14.4 SDK
and running on 14.4 or later. It will fall back automatically to other
primitives when running on older systems.
2024-10-10 01:07:36 -04:00
Randy Eckenrode
d8906e4851
treewide: switch to moltenvk from darwin.moltenvk 2024-10-10 01:06:41 -04:00
R. RyanTM
e62d2eba7d
wine-staging: 9.18 -> 9.19 (#346803) 2024-10-06 18:48:24 +02:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Alexander V. Nikolaev
370458d7f1
wine64Packages.{unstable,staging}: 9.17 -> 9.18 2024-09-22 21:53:17 +03:00
Artturin
350a470a54
wine64Packages{stable,staging,unstable}.minimal: enable MinGW on Darwin (#329577) 2024-09-12 00:00:27 +03:00
Alexander V. Nikolaev
952c75756f
wine64Packages.{unstable,staging}: 9.16 -> 9.17 2024-09-08 16:00:09 +03:00
K900
b76567c281 Merge remote-tracking branch 'origin/master' into staging-next 2024-08-25 15:20:44 +03:00
R. Ryantm
448c32f75a wine-staging: 9.15 -> 9.16 2024-08-25 03:42:54 +00:00
Sergei Trofimovich
124392093c wine64Packages.wayland: add missing wayland-scanner build input
Without the change the build fails on `staging` as:

    wine64-wayland> checking for wayland-scanner... Package wayland-scanner was not found in the pkg-config search path.
    wine64-wayland> Perhaps you should add the directory containing `wayland-scanner.pc'
    wine64-wayland> to the PKG_CONFIG_PATH environment variable
    wine64-wayland> No package 'wayland-scanner' found
    wine64-wayland> no
    ...
    wine64-wayland> configure: error: Wayland 64-bit development files not found or not new enough, the Wayland driver won't be supported.
    wine64-wayland> This is an error since --with-wayland was requested.
2024-08-20 06:58:25 +01:00
Alexander V. Nikolaev
f0f7648d28
wine64Packages.{unstable,staging}: 9.14 -> 9.15 2024-08-11 18:45:08 +03:00
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
Randy Eckenrode
e90fae6a96
wine64Packages{stable,staging,unstable}.minimal: enable MinGW on Darwin
Darwin can’t build Wine without using MinGW. Rather than have Wine’s minimal packages be disabled, enable it just for Darwin.
2024-07-24 00:53:15 -04: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