public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40641 from angerman/feature/darwin-wine

Browse Source 
Enable WINE on macOS
This commit is contained in:
John Ericson 2018-05-18 17:42:12 -04:00 committed by GitHub
commit 974fa94fd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/misc/emulators/wine/base.nix
View File

@ -6,8 +6,6 @@
buildScript ? null, configureFlags ? "" buildScript ? null, configureFlags ? ""
}: }:
assert stdenv.cc.cc.isGNU or false;
with import ./util.nix { inherit lib; }; with import ./util.nix { inherit lib; };
stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
@ -54,9 +52,14 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ]
++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]
++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ] ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ]
++ (with pkgs.xorg; [ ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security
]))); ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon
])
++ lib.optionals stdenv.isLinux (with pkgs.xorg; [
libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext
])
++ [ pkgs.xorg.libX11 ]));
# Wine locates a lot of libraries dynamically through dlopen(). Add # 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 # them to the RPATH so that the user doesn't have to set them in
@ -105,7 +108,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
# https://bugs.winehq.org/show_bug.cgi?id=43530 # https://bugs.winehq.org/show_bug.cgi?id=43530
# https://github.com/NixOS/nixpkgs/issues/31989 # https://github.com/NixOS/nixpkgs/issues/31989
hardeningDisable = [ "bindnow" ]; hardeningDisable = [ "bindnow" ]
++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify";
passthru = { inherit pkgArches; }; passthru = { inherit pkgArches; };
meta = { meta = {

2
pkgs/misc/emulators/wine/packages.nix
View File

@ -20,7 +20,7 @@ in with src; {
geckos = [ gecko64 ]; geckos = [ gecko64 ];
monos = [ mono ]; monos = [ mono ];
configureFlags = [ "--enable-win64" ]; configureFlags = [ "--enable-win64" ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" "x86_64-darwin" ];
}; };
wineWow = callPackage ./base.nix { wineWow = callPackage ./base.nix {
name = "wine-wow-${version}"; name = "wine-wow-${version}";