git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #139656 from Atemu/expose-wine64

all-packages: expose wine64Packages

commit9544c029c082a7e545ec75c101f0202f18eb3874 authorRyan Burns <52847440+r-burns@users.noreply.github.com> dateThu 7 Oct 2021, 00:53 (5 years ago) parentcb907c57aa540a
2 files changed+3−1
compare with master
unifiedsplit
pkgs/misc/emulators/wine/base.nix+1−1 pkgs/top-level/all-packages.nix+2
pkgs/misc/emulators/wine/base.nix+1−1
@@ -74,7 +74,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
7474 ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
7575 ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ]
7676 ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]
77− ++ lib.optionals openglSupport [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ]
77+ ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ]
7878 ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
7979 CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security
8080 ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon
pkgs/top-level/all-packages.nix+2
@@ -32624,9 +32624,11 @@ with pkgs;
3262432624 });
3262532625
3262632626 winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32"));
32627+ wine64Packages = recurseIntoAttrs (winePackagesFor "wine64");
3262732628 wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow");
3262832629
3262932630 wine = winePackages.full;
32631+ wine64 = wine64Packages.full;
3263032632
3263132633 wine-staging = lowPrio (winePackages.full.override {
3263232634 wineRelease = "staging";