diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2024-02-23 22:30:45 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2024-02-24 08:02:22 +0000 |
| commit | 8f3b751ca8a8f5978d76fbe35b6f6b229f463275 (patch) | |
| tree | 2dfb3e25ff457ed3483ccac901974654bf0d2a10 /pkgs/applications/emulators/wine | |
| parent | 7f81b2dee02b8337dc58fd0edb93eefd67e518b0 (diff) | |
| download | nixlib-8f3b751ca8a8f5978d76fbe35b6f6b229f463275.tar nixlib-8f3b751ca8a8f5978d76fbe35b6f6b229f463275.tar.gz nixlib-8f3b751ca8a8f5978d76fbe35b6f6b229f463275.tar.bz2 nixlib-8f3b751ca8a8f5978d76fbe35b6f6b229f463275.tar.lz nixlib-8f3b751ca8a8f5978d76fbe35b6f6b229f463275.tar.xz nixlib-8f3b751ca8a8f5978d76fbe35b6f6b229f463275.tar.zst nixlib-8f3b751ca8a8f5978d76fbe35b6f6b229f463275.zip | |
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>
Diffstat (limited to 'pkgs/applications/emulators/wine')
| -rw-r--r-- | pkgs/applications/emulators/wine/base.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index fc6d08556091..b290a324f970 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { configureFlags = prevConfigFlags ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] - ++ lib.optionals (stdenv.isDarwin && !supportFlags.xineramaSupport) [ "--without-x" ]; + ++ lib.optionals ((stdenv.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support) [ "--without-x" ]; # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in |